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/9e4d7aad Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9e4d7aad Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9e4d7aad Branch: refs/heads/ignite-843-rc2 Commit: 9e4d7aad1fc8ba86e32c4e8a36c6501e1c7950ee Parents: 9326566 debe34d Author: Alexey Kuznetsov <[email protected]> Authored: Thu Dec 24 18:33:32 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Thu Dec 24 18:33:32 2015 +0700 ---------------------------------------------------------------------- README.txt | 4 +- .../JettyRestProcessorAbstractSelfTest.java | 25 +++- .../connection/GridClientNioTcpConnection.java | 17 +-- .../processors/cache/GridCacheProcessor.java | 3 +- .../binary/CacheObjectBinaryProcessorImpl.java | 3 + .../dht/atomic/GridDhtAtomicCache.java | 89 ++++++------ .../GridDhtPartitionsExchangeFuture.java | 20 ++- ...ridNearOptimisticTxPrepareFutureAdapter.java | 10 +- .../client/message/GridClientCacheBean.java | 139 +++++++++++++++++++ .../rest/client/message/GridClientNodeBean.java | 70 ++++++---- .../top/GridTopologyCommandHandler.java | 38 +++-- .../ignite/IgniteCacheAffinitySelfTest.java | 7 - .../fair/FairAffinityDynamicCacheSelfTest.java | 17 +-- .../cache/CrossCacheTxRandomOperationsTest.java | 2 - ...yMetadataUpdateChangingTopologySelfTest.java | 97 ++++++++----- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +- .../TcpDiscoveryMulticastIpFinderSelfTest.java | 21 ++- .../IgniteCacheRestartTestSuite2.java | 3 + .../stream/mqtt/IgniteMqttStreamerTest.java | 33 +++-- 19 files changed, 405 insertions(+), 196 deletions(-) ----------------------------------------------------------------------
