This is an automated email from the ASF dual-hosted git repository. dgovorukhin pushed a commit to branch ignite-10809-dg in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 2b4b1662e8d6b81d48a7141100fbc6f63ff212dd Merge: 6b6c0f1 40f1fc9 Author: Dmitriy Govorukhin <[email protected]> AuthorDate: Fri Jan 11 00:21:51 2019 +0300 Merge branch 'master' into ignite-10809-dg # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java bin/include/parseargs.sh | 10 + modules/cassandra/store/pom.xml | 4 +- .../apache/ignite/tests/utils/CassandraHelper.java | 4 +- .../ignite/tests/utils/CassandraLifeCycleBean.java | 1 + .../org/apache/ignite/internal/IgniteKernal.java | 19 ++ .../managers/discovery/GridDiscoveryManager.java | 2 +- .../internal/processors/cache/WalStateManager.java | 6 +- .../startup/cmdline/CommandLineTransformer.java | 10 +- ...eRebalanceOnCachesStoppingOrDestroyingTest.java | 207 ++++++++++++--------- .../GridCommandLineTransformerSelfTest.java | 6 +- modules/platforms/cpp/core/src/ignition.cpp | 17 +- .../Apache.Ignite.Core/Impl/IgniteManager.cs | 8 +- .../app/components/page-configure/template.pug | 4 +- 13 files changed, 198 insertions(+), 100 deletions(-)
