Merge branches 'ignite-2.1.1' and 'ignite-5519' of https://github.com/gridgain/apache-ignite into ignite-2.1.1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/42e8ca63 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/42e8ca63 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/42e8ca63 Branch: refs/heads/ignite-2.1.2-exchange Commit: 42e8ca632c4e34c31c6c0d8f1aa899aef3e1ed43 Parents: 5a63664 1c653cb Author: Ilya Lantukh <[email protected]> Authored: Sat Jun 17 17:49:08 2017 +0300 Committer: Ilya Lantukh <[email protected]> Committed: Sat Jun 17 17:49:08 2017 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtPartitionTopologyImpl.java | 9 ++++++++- .../near/GridCachePartitionedNodeRestartTest.java | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
