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 2016/01/04 08:28:07 UTC

[21/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2


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

Branch: refs/heads/ignite-2218
Commit: 7049f52ee956a168b4dcb043a672a6a9eb04ce56
Parents: fad8b7a 18c413c
Author: Anton Vinogradov <av...@apache.org>
Authored: Fri Dec 25 17:10:35 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Fri Dec 25 17:10:35 2015 +0300

----------------------------------------------------------------------
 .../JettyRestProcessorAbstractSelfTest.java     |  25 +++-
 .../ignite/internal/binary/BinaryContext.java   |  44 +-----
 .../internal/binary/BinaryEnumObjectImpl.java   |   4 +-
 .../internal/binary/BinaryObjectImpl.java       |  27 ++--
 .../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 +-
 .../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 +
 .../communication/tcp/TcpCommunicationSpi.java  |  12 +-
 .../ignite/IgniteCacheAffinitySelfTest.java     |   7 -
 .../fair/FairAffinityDynamicCacheSelfTest.java  |  17 +--
 .../cache/CrossCacheTxRandomOperationsTest.java |   2 -
 ...yMetadataUpdateChangingTopologySelfTest.java |  97 ++++++++-----
 .../internal/util/nio/GridNioSelfTest.java      | 127 ++++++++++-------
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |  17 ++-
 .../TcpDiscoveryMulticastIpFinderSelfTest.java  |  21 ++-
 .../IgniteCacheRestartTestSuite2.java           |   3 +
 .../stream/mqtt/IgniteMqttStreamerTest.java     |  33 +++--
 .../GridUriDeploymentFileProcessorSelfTest.java |  19 ++-
 27 files changed, 617 insertions(+), 323 deletions(-)
----------------------------------------------------------------------