Merge remote-tracking branch 'origin/ignite-5578-locJoin' into ignite-5578-locJoin
# Conflicts: # modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionStateTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b5319a02 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b5319a02 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b5319a02 Branch: refs/heads/ignite-5578-locJoin Commit: b5319a02a5f247db3979b8d7e85ca736a7fae127 Parents: d4bd1ee 84d10ae Author: sboikov <[email protected]> Authored: Thu Jul 13 13:21:16 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Jul 13 13:21:16 2017 +0300 ---------------------------------------------------------------------- ----------------------------------------------------------------------
