You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/12/28 11:16:50 UTC
[12/13] ignite git commit: Merge branch 'ignite-1.5' into ignite-2206
Merge branch 'ignite-1.5' into ignite-2206
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/40d2291a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/40d2291a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/40d2291a
Branch: refs/heads/ignite-2206
Commit: 40d2291a5a0cd565884d01bf5783b77b565e6742
Parents: eb14e68 18c413c
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Sat Dec 26 16:31:57 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Sat Dec 26 16:31:57 2015 +0300
----------------------------------------------------------------------
README.txt | 4 +-
.../JettyRestProcessorAbstractSelfTest.java | 25 +++-
.../ignite/internal/binary/BinaryContext.java | 44 +-----
.../internal/binary/BinaryEnumObjectImpl.java | 4 +-
.../internal/binary/BinaryObjectImpl.java | 29 ++--
.../internal/binary/GridBinaryMarshaller.java | 82 ++++++++++-
.../connection/GridClientNioTcpConnection.java | 17 +--
.../processors/cache/GridCacheProcessor.java | 3 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 3 +
.../dht/atomic/GridDhtAtomicCache.java | 89 ++++++------
.../GridDhtPartitionsExchangeFuture.java | 20 ++-
...ridNearOptimisticTxPrepareFutureAdapter.java | 10 +-
.../processors/query/GridQueryProcessor.java | 5 +
.../client/message/GridClientCacheBean.java | 139 +++++++++++++++++++
.../rest/client/message/GridClientNodeBean.java | 70 ++++++----
.../top/GridTopologyCommandHandler.java | 38 +++--
.../util/nio/GridNioRecoveryDescriptor.java | 7 -
.../ignite/internal/util/nio/GridNioServer.java | 7 +
.../internal/visor/util/VisorTaskUtils.java | 122 +++++++++++++++-
.../communication/tcp/TcpCommunicationSpi.java | 12 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 7 -
.../fair/FairAffinityDynamicCacheSelfTest.java | 17 +--
.../binary/BinaryMarshallerSelfTest.java | 5 +-
.../cache/CrossCacheTxRandomOperationsTest.java | 2 -
...yMetadataUpdateChangingTopologySelfTest.java | 97 ++++++++-----
.../internal/util/nio/GridNioSelfTest.java | 127 ++++++++++-------
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 17 ++-
.../TcpDiscoveryMulticastIpFinderSelfTest.java | 21 ++-
.../IgniteCacheRestartTestSuite2.java | 3 +
.../ignite/tests/p2p/cache/PersonWrapper.java | 121 ++++++++++++++++
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 16 ++-
...eBinaryWrappedObjectFieldsQuerySelfTest.java | 28 ++++
.../IgniteBinaryCacheQueryTestSuite.java | 4 +
.../IgniteCacheQuerySelfTestSuite.java | 4 +
.../stream/mqtt/IgniteMqttStreamerTest.java | 33 +++--
.../GridUriDeploymentFileProcessorSelfTest.java | 19 ++-
37 files changed, 914 insertions(+), 339 deletions(-)
----------------------------------------------------------------------