Merge remote-tracking branch 'remotes/origin/master' into ignite-gg-9615
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/43d7c8cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/43d7c8cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/43d7c8cc Branch: refs/heads/ignite-gg-9615 Commit: 43d7c8cc114b2565a4e5d77e31b92ccb39791468 Parents: cf2ff2d 77da728 Author: Pavel Tupitsyn <ptupit...@gridgain.com> Authored: Thu Jul 16 09:32:22 2015 +0300 Committer: Pavel Tupitsyn <ptupit...@gridgain.com> Committed: Thu Jul 16 09:32:22 2015 +0300 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 35 ++++++++++++-------- .../apache/ignite/cache/spring/SpringCache.java | 2 +- .../ignite/cache/spring/SpringCacheManager.java | 22 ++++++------ 3 files changed, 35 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
