This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-14864 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 86db234943d6970e5a680bc2fa03b6fe636add17 Merge: e5b505b 7610b69 Author: Andrew Mashenkov <[email protected]> AuthorDate: Wed Jun 30 17:49:30 2021 +0300 Merge remote-tracking branch 'apache/main' into gg-14864 RELEASE.md | 20 +++- .../main/java/org/apache/ignite/app/Ignition.java | 26 ++++- .../org/apache/ignite/app/IgnitionManager.java | 32 ++++-- modules/configuration/pom.xml | 5 + .../configuration/ConfigurationManager.java | 9 +- .../client/ITMetaStorageServiceTest.java | 2 - .../org/apache/ignite/app/IgniteCliRunner.java | 8 +- .../apache/ignite/internal/app/IgnitionImpl.java | 48 +++++++- modules/transactions/README.md | 124 +++++++++++++++++++++ modules/{configuration => transactions}/pom.xml | 51 ++++++++- .../org/apache/ignite/internal/tx/LockManager.java | 54 +++++++++ .../ignite/internal/tx/LockOrderException.java} | 19 +--- .../ignite/internal/tx/LockManagerTest.java} | 19 +--- pom.xml | 1 + 14 files changed, 351 insertions(+), 67 deletions(-)
