Merge branch 'ignite-1.5' into ignite-2100
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6a038cb1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6a038cb1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6a038cb1 Branch: refs/heads/ignite-2100 Commit: 6a038cb1e41cd74206f19ee63a15cac9d308d7a0 Parents: 972d5a9 c930e7d Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Dec 15 12:31:28 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Dec 15 12:31:28 2015 +0300 ---------------------------------------------------------------------- assembly/release-fabric-base.xml | 4 +- .../CacheClientBinaryPutGetExample.java | 6 +- .../datagrid/CacheClientBinaryQueryExample.java | 7 +- .../starschema/CacheStarSchemaExample.java | 9 +- modules/clients/pom.xml | 60 + .../processors/cache/GridCacheAdapter.java | 9 +- .../IgniteTxExceptionAbstractSelfTest.java | 59 +- .../GridCacheQueueApiSelfAbstractTest.java | 86 +- .../near/GridCacheNearTxExceptionSelfTest.java | 20 - .../BinaryAtomicCacheLocalEntriesSelfTest.java | 30 + .../BinaryTxCacheLocalEntriesSelfTest.java | 84 + .../GridSessionCheckpointAbstractSelfTest.java | 32 +- .../testframework/junits/GridAbstractTest.java | 10 +- .../IgniteBinaryObjectsTestSuite.java | 23 +- modules/platforms/cpp/cpp.dxg | 4 +- modules/platforms/dotnet/dotnet.dxg | 1795 ++++++++++++++++++ .../Compute/ClosureExample.cs | 2 +- .../Compute/TaskExample.cs | 2 +- .../Datagrid/ContinuousQueryExample.cs | 2 +- .../Datagrid/DataStreamerExample.cs | 2 +- .../Datagrid/PutGetExample.cs | 2 +- .../Datagrid/QueryExample.cs | 2 +- .../Datagrid/StoreExample.cs | 2 +- .../Datagrid/TransactionExample.cs | 2 +- .../Events/EventsExample.cs | 2 +- .../Services/ServicesExample.cs | 2 +- modules/platforms/dotnet/header.html | 27 + .../cache/IgnitePutGetBatchBenchmark.java | 61 + .../cache/IgnitePutGetTxBatchBenchmark.java | 87 + 29 files changed, 2302 insertions(+), 131 deletions(-) ----------------------------------------------------------------------