Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fe401b5e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fe401b5e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fe401b5e Branch: refs/heads/ignite-1093-2 Commit: fe401b5e15bbae8dd59dc78f8ea8f079f5763042 Parents: a21b50a 0acb5db Author: Anton Vinogradov <a...@apache.org> Authored: Wed Oct 21 14:56:15 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Wed Oct 21 14:56:15 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/igfs/IgfsMetaManager.java | 10 +++++++--- .../processors/cache/CacheAffinityCallSelfTest.java | 4 +++- .../replicated/GridReplicatedTxPreloadTest.java | 7 ++++++- 3 files changed, 16 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
