Merge branches 'ignite-843-rc1' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/60d85000 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/60d85000 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/60d85000 Branch: refs/heads/ignite-843-rc1 Commit: 60d850009e83a9fe66c7ebe504289b00254ac722 Parents: bd7b27d 43b40f4 Author: Alexey Kuznetsov <[email protected]> Authored: Wed Oct 21 08:53:22 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Oct 21 08:53:22 2015 +0700 ---------------------------------------------------------------------- .../ignite/internal/processors/igfs/IgfsMetaManager.java | 10 +++++++--- .../processors/cache/CacheAffinityCallSelfTest.java | 4 +++- .../IgniteCacheClientNodeChangingTopologyTest.java | 4 +++- 3 files changed, 13 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
