Merge remote-tracking branch 'remotes/upstream/ignite-1.6.9' into ignite-1.7.2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/920b56e7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/920b56e7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/920b56e7 Branch: refs/heads/master Commit: 920b56e777a5ca0d0a5fb9bfa27622c3b4c17ea5 Parents: 52e9a2b 40f6472 Author: Anton Vinogradov <[email protected]> Authored: Fri Sep 23 11:40:16 2016 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Fri Sep 23 11:40:16 2016 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 5 +++++ .../internal/processors/cache/transactions/IgniteTxManager.java | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
