Merge branches 'ignite-1.6' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/41e37a52 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/41e37a52 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/41e37a52 Branch: refs/heads/ignite-2832 Commit: 41e37a52b9d1c8fabb25cd7a74c575efaa215dda Parents: 388ffef b27ebe6 Author: Alexey Kuznetsov <[email protected]> Authored: Tue May 10 10:34:52 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue May 10 10:34:52 2016 +0700 ---------------------------------------------------------------------- .../visor/cache/VisorCacheAffinityNodeTask.java | 70 ++++++++++++++++++++ .../visor/cache/VisorCacheConfiguration.java | 5 +- 2 files changed, 73 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
