Merge branch 'ignite-4795'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a9ffced1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a9ffced1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a9ffced1 Branch: refs/heads/ignite-4929 Commit: a9ffced1493439df2c8c43d85e819b2916840387 Parents: 775c6e5 9319305 Author: agura <[email protected]> Authored: Wed Apr 12 16:40:36 2017 +0300 Committer: agura <[email protected]> Committed: Wed Apr 12 16:40:36 2017 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 265 +++++++------------ .../transactions/IgniteTransactionsImpl.java | 4 +- .../TransactionDeadlockException.java | 4 +- .../transactions/TransactionException.java | 80 ++++++ .../TransactionHeuristicException.java | 4 +- .../TransactionOptimisticException.java | 4 +- .../TransactionRollbackException.java | 4 +- .../TransactionTimeoutException.java | 4 +- 8 files changed, 180 insertions(+), 189 deletions(-) ----------------------------------------------------------------------
