Merge remote-tracking branch 'remotes/community/ignite-1.7.2' into UPSTREAM_master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/16a29d31 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/16a29d31 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/16a29d31 Branch: refs/heads/master Commit: 16a29d311b23d8e136fd05b2e5ae4f6da3e9ecab Parents: 9cd4ab8 dfc7288 Author: Pavel Tupitsyn <[email protected]> Authored: Fri Sep 23 19:19:31 2016 +0300 Committer: Pavel Tupitsyn <[email protected]> Committed: Fri Sep 23 19:19:31 2016 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 5 +++++ .../internal/processors/cache/transactions/IgniteTxManager.java | 5 +---- .../platform/websession/PlatformDotNetSessionLockProcessor.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
