Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-968
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f7117733 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f7117733 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f7117733 Branch: refs/heads/ignite-gg-9621 Commit: f7117733048304b02f9565fcf4aeb1fd7614b9c1 Parents: 3ebb1c0 8719b73 Author: sboikov <semen.boi...@inria.fr> Authored: Tue Jun 2 18:50:09 2015 +0300 Committer: sboikov <semen.boi...@inria.fr> Committed: Tue Jun 2 18:50:09 2015 +0300 ---------------------------------------------------------------------- assembly/dependencies-visor-console.xml | 3 +++ .../cache/eviction/random/RandomEvictionPolicy.java | 3 ++- .../internal/managers/communication/GridIoManager.java | 12 +++++------- .../distributed/dht/preloader/GridDhtPreloader.java | 9 ++++++--- .../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../random/RandomEvictionPolicyCacheSizeSelfTest.java | 6 ++++++ .../testsuites/IgniteCacheQuerySelfTestSuite.java | 2 +- 7 files changed, 24 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
