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/e92fb51c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e92fb51c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e92fb51c Branch: refs/heads/ignite-2100 Commit: e92fb51c7cd77eb7b06653688faded4f59cbd91f Parents: 74e478d d6b4611 Author: vozerov-gridgain <[email protected]> Authored: Mon Dec 14 15:22:23 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Mon Dec 14 15:22:23 2015 +0300 ---------------------------------------------------------------------- .../dht/GridPartitionedSingleGetFuture.java | 14 +++++++---- .../GridCacheAbstractNodeRestartSelfTest.java | 25 +++++++++----------- modules/platforms/cpp/common/src/java.cpp | 8 +++---- 3 files changed, 25 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
