Merge remote-tracking branch 'origin/ignite-3716' into ignite-3716 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/escape/OdbcEscapeSequenceParser.java # modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcScalarFunctionEscapeSequenceTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59a734a8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59a734a8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59a734a8 Branch: refs/heads/ignite-3716 Commit: 59a734a884d96b53647aed9f93a0f20d6837a7d7 Parents: 06df249 ed40518 Author: Andrey V. Mashenkov <[email protected]> Authored: Mon Aug 22 18:20:20 2016 +0300 Committer: Andrey V. Mashenkov <[email protected]> Committed: Mon Aug 22 18:20:20 2016 +0300 ---------------------------------------------------------------------- ----------------------------------------------------------------------
