Merge branch 'ignite-1.6.12' into ignite-1.7.7 # Conflicts: # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dc24068c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dc24068c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dc24068c Branch: refs/heads/ignite-1.9 Commit: dc24068cdd581ea0298c7750a6eec56184f2c3ec Parents: 4bf7fdf 1859857 Author: devozerov <[email protected]> Authored: Wed Feb 8 12:36:42 2017 +0300 Committer: devozerov <[email protected]> Committed: Wed Feb 8 12:36:42 2017 +0300 ---------------------------------------------------------------------- ----------------------------------------------------------------------
