Merge remote-tracking branch 'origin/ignite-1232' into ignite-1232 # Conflicts: # modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/407b306d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/407b306d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/407b306d Branch: refs/heads/ignite-1232 Commit: 407b306d5a6e7b59f2285feaeb2364f9bef31f32 Parents: bbfef04 8ab0608 Author: sboikov <[email protected]> Authored: Thu Jun 30 19:51:34 2016 +0300 Committer: sboikov <[email protected]> Committed: Thu Jun 30 19:51:34 2016 +0300 ---------------------------------------------------------------------- ----------------------------------------------------------------------
