Merge branches 'ignite-2.1.4' and 'ignite-6181' of 
https://github.com/gridgain/apache-ignite into ignite-6181


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

Branch: refs/heads/ignite-6181-1
Commit: 94acdf5e3f4d9daced8cb75f651d5c87fa5c4def
Parents: d6f0b26 01c627a
Author: Aleksei Scherbakov <alexey.scherbak...@gmail.com>
Authored: Wed Aug 30 19:49:18 2017 +0300
Committer: Aleksei Scherbakov <alexey.scherbak...@gmail.com>
Committed: Wed Aug 30 19:49:18 2017 +0300

----------------------------------------------------------------------
 .../dht/GridClientPartitionTopology.java        | 18 ++++--
 .../distributed/dht/GridDhtLocalPartition.java  |  8 +--
 .../dht/GridDhtPartitionTopologyImpl.java       | 59 +++++++++-----------
 .../GridDhtPartitionsExchangeFuture.java        | 15 ++++-
 .../IgnitePdsCacheRebalancingAbstractTest.java  | 44 ++++++++++++++-
 .../query/h2/opt/GridLuceneDirectory.java       |  2 +-
 .../query/h2/opt/GridLuceneIndex.java           |  2 +-
 .../PersistentStoreConfiguration.cs             |  2 +-
 8 files changed, 96 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


Reply via email to