Merge branch 'ignite-1.5' into ignite-1956
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1e023b01
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1e023b01
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1e023b01
Branch: refs/heads/ignite-1956
Commit: 1e023b013041738dfe3099bd489733681e95a29e
Parents: 2c67cd0 c584cca
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Thu Nov 26 15:09:07 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Thu Nov 26 15:09:07 2015 +0300
----------------------------------------------------------------------
.../managers/discovery/GridDiscoveryManager.java | 19 +++++++------------
.../processors/cache/GridCacheIoManager.java | 2 --
.../processors/cache/GridCacheProcessor.java | 7 -------
.../dht/GridPartitionedSingleGetFuture.java | 1 -
.../distributed/IgniteCacheSizeFailoverTest.java | 7 +++++++
5 files changed, 14 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
|