Merge remote-tracking branch 'origin/ignite-sprint-3-p1' into ignite-sprint-3-p1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9934af12 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9934af12 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9934af12 Branch: refs/heads/ignite-648 Commit: 9934af1278bdda620429b8d278b19e3e144b65aa Parents: 6a6ca1a 54390af Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Apr 17 22:22:02 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Apr 17 22:22:02 2015 +0700 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 18 +++++++- .../processors/cache/GridCacheAdapter.java | 43 ++++++++------------ 2 files changed, 34 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
