Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 debb326d3 -> 580d1a1d0


Merge branches 'ignite-1.5' and 'ignite-843-rc2' of 
https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc2


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2d2f44e2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2d2f44e2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2d2f44e2

Branch: refs/heads/ignite-843-rc2
Commit: 2d2f44e2182d3356171d2d7b37110f8ed3c6bc9e
Parents: 5b31c31 ed5f279
Author: AKuznetsov <[email protected]>
Authored: Tue Dec 15 22:22:38 2015 +0700
Committer: AKuznetsov <[email protected]>
Committed: Tue Dec 15 22:22:38 2015 +0700

----------------------------------------------------------------------
 bin/ignitevisorcmd.bat                          |    1 +
 .../store/auto/CacheBinaryAutoStoreExample.java |    7 +-
 modules/clients/pom.xml                         |    2 +-
 .../org/apache/ignite/cache/CacheManager.java   |    2 +
 .../CacheDataStructuresManager.java             |    5 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |    7 +-
 .../dht/GridPartitionedSingleGetFuture.java     |    7 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |   10 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   36 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |   25 +
 .../distributed/near/GridNearAtomicCache.java   |    3 +
 .../cache/query/GridCacheQueryRequest.java      |   12 +-
 .../CacheSerializableTransactionsTest.java      |    8 +
 .../cache/GridCacheAbstractFullApiSelfTest.java |    8 +
 ...IgniteCacheAtomicPutAllFailoverSelfTest.java |    1 +
 ...ntNodeBinaryObjectMetadataMultinodeTest.java |    8 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |   86 +-
 ...gniteAtomicLongChangingTopologySelfTest.java |    8 +-
 ...omicMultiNodeP2PDisabledFullApiSelfTest.java |    5 -
 ...ledFairAffinityMultiNodeFullApiSelfTest.java |    5 -
 .../near/NearCacheSyncUpdateTest.java           |  167 ++
 .../GridCacheRebalancingSyncSelfTest.java       |   12 +-
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |   30 +-
 ...CommunicationRecoveryAckClosureSelfTest.java |   39 +-
 .../testframework/junits/GridAbstractTest.java  |   10 +-
 .../testsuites/IgniteCacheTestSuite2.java       |    2 +
 .../IgniteSpiDiscoverySelfTestSuite.java        |    6 +
 modules/platforms/cpp/cpp.dxg                   |    2 +-
 modules/platforms/dotnet/Apache.Ignite.dxg      |    2 +-
 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 +-
 .../cache/IgnitePutGetBatchBenchmark.java       |   60 +
 .../cache/IgnitePutGetTxBatchBenchmark.java     |   86 +
 42 files changed, 554 insertions(+), 1923 deletions(-)
----------------------------------------------------------------------


Reply via email to