Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into IGNITE-7485
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/138ff50f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/138ff50f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/138ff50f Branch: refs/heads/ignite-7485-2 Commit: 138ff50fd82a7a2c5ec21b5bc3143f6092c2597e Parents: bb9f857 89e7df0 Author: Alexey Kuznetsov <[email protected]> Authored: Mon Jan 29 09:53:20 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Jan 29 09:53:20 2018 +0700 ---------------------------------------------------------------------- .gitignore | 4 +++ bin/control.bat | 10 +++--- bin/ignite.bat | 4 +-- bin/ignitevisorcmd.bat | 10 +++--- .../thin/JdbcThinWalModeChangeSelfTest.java | 37 ++++++++++++++++---- .../WalModeChangeCommonAbstractSelfTest.java | 3 +- .../query/h2/ddl/DdlStatementsProcessor.java | 16 ++++++--- .../config/benchmark-atomic.properties | 2 +- 8 files changed, 61 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
