Merge remote-tracking branch 'remotes/origin/master' into ignite-4929
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4e80e0ca Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4e80e0ca Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4e80e0ca Branch: refs/heads/ignite-4929 Commit: 4e80e0caa4fc3fa8cd0aa0157dbb87b8e1289e59 Parents: 0d0297e edfa353 Author: sboikov <[email protected]> Authored: Tue Apr 11 11:33:53 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Apr 11 11:33:53 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAtomicFuture.java | 2 +- .../processors/cache/GridCacheMvccManager.java | 84 ++++++++++++++++---- .../cache/GridDeferredAckMessageSender.java | 11 ++- .../GridDhtAtomicAbstractUpdateFuture.java | 4 +- .../GridNearAtomicAbstractUpdateFuture.java | 2 +- .../GridNearAtomicSingleUpdateFuture.java | 21 ++--- .../dht/atomic/GridNearAtomicUpdateFuture.java | 23 +++--- .../cache/transactions/IgniteTxManager.java | 2 +- modules/log4j2/pom.xml | 4 +- .../ignite/logger/log4j2/Log4J2Logger.java | 23 ++++-- 10 files changed, 122 insertions(+), 54 deletions(-) ----------------------------------------------------------------------
