Merge remote-tracking branch 'remotes/origin/ignite-99-2' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4264bf55 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4264bf55 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4264bf55 Branch: refs/heads/ignite-132 Commit: 4264bf558e9a3cfc73193d7c1a70b4c46ee1ce2c Parents: c2363b6 a8d39b0 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Jan 27 19:48:36 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Jan 27 19:48:36 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 10 + .../ignite/cache/affinity/CacheAffinity.java | 9 +- .../org/apache/ignite/internal/GridKernal.java | 11 + .../affinity/GridAffinityAssignment.java | 10 +- .../affinity/GridAffinityProcessor.java | 330 ++++++++++++++++++- .../apache/ignite/internal/util/GridUtils.java | 9 + .../apache/ignite/IgniteCacheAffinityTest.java | 266 +++++++++++++++ .../testframework/junits/GridTestIgnite.java | 6 + .../org/apache/ignite/IgniteSpringBean.java | 6 + 9 files changed, 635 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4264bf55/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4264bf55/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java ----------------------------------------------------------------------
