Merge branch 'ignite-1.6.12' into ignite-1.8.3 # 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/96b0f7f7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/96b0f7f7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/96b0f7f7 Branch: refs/heads/ignite-1.9 Commit: 96b0f7f79e85606e8cdfd9e85161453f8b8f85fa Parents: 6e68f64 1859857 Author: devozerov <[email protected]> Authored: Mon Feb 6 15:14:39 2017 +0300 Committer: devozerov <[email protected]> Committed: Mon Feb 6 15:14:39 2017 +0300 ---------------------------------------------------------------------- ----------------------------------------------------------------------
