Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6bd0f8f4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6bd0f8f4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6bd0f8f4 Branch: refs/heads/ignite-gg-10760 Commit: 6bd0f8f405268214c62e2289a0081a238053fc11 Parents: 72e270c dcd8b42 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Sep 15 16:55:19 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Sep 15 16:55:19 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheProcessor.java | 10 +- .../dht/GridClientPartitionTopology.java | 104 +++++++++++-------- .../dht/GridDhtPartitionTopology.java | 4 +- .../dht/GridDhtPartitionTopologyImpl.java | 7 +- .../cache/transactions/IgniteTxHandler.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 16 +++ .../processors/igfs/IgfsAbstractSelfTest.java | 3 +- .../testsuites/IgniteHadoopTestSuite.java | 6 +- ...CacheScanPartitionQueryFallbackSelfTest.java | 54 ++++------ 9 files changed, 114 insertions(+), 92 deletions(-) ----------------------------------------------------------------------