Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-gg-11810
# Conflicts: # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f92ddd25 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f92ddd25 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f92ddd25 Branch: refs/heads/ignite-gg-11810-1 Commit: f92ddd258899298fd51123b200d3e274f534c6e2 Parents: c1d5081 fbf13d4 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jan 12 16:31:37 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jan 12 16:31:37 2017 +0300 ---------------------------------------------------------------------- .../near/IgniteCachePartitionedFieldsQuerySelfTest.java | 8 ++++---- .../replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java | 6 +++--- .../processors/query/h2/opt/GridH2TableSelfTest.java | 6 ++---- .../processors/query/h2/sql/GridQueryParsingTest.java | 4 ++-- 4 files changed, 11 insertions(+), 13 deletions(-) ----------------------------------------------------------------------