Merge branch 'ignite-sprint-4' into ignite-774
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ad333fb6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad333fb6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad333fb6 Branch: refs/heads/ignite-774 Commit: ad333fb66e0aca1f6c23c2fa5ebf77c694edf667 Parents: 8607e76 8267b82 Author: Artem Shutak <ashu...@gridgain.com> Authored: Wed Apr 22 18:14:21 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Wed Apr 22 18:14:21 2015 +0300 ---------------------------------------------------------------------- .../managers/discovery/GridDiscoveryManager.java | 18 +++++++++++++----- .../IgniteCacheObjectProcessorImpl.java | 2 +- .../internal/processors/job/GridJobProcessor.java | 6 ++++++ ...dCacheSortedEvictionPolicyPerformanceTest.java | 13 ++++++------- pom.xml | 14 +++++--------- 5 files changed, 31 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad333fb6/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ----------------------------------------------------------------------
