Merge branches 'ignite-comm-balance-master' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-comm-balance-master-apache
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d1c01d0a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d1c01d0a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d1c01d0a Branch: refs/heads/ignite-comm-balance-master Commit: d1c01d0aa0629801041d08d8e2bae8218b30f9a4 Parents: b564686 e613c00 Author: Yakov Zhdanov <[email protected]> Authored: Wed Feb 1 15:03:40 2017 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Wed Feb 1 15:03:40 2017 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 3 - .../cache/distributed/near/GridNearTxLocal.java | 2 +- .../transactions/PlatformTransactions.java | 9 + .../Apache.Ignite.Core.Tests.csproj | 1 + .../Cache/CacheAbstractTest.cs | 21 ++ .../Cache/CacheAbstractTransactionalTest.cs | 325 +++++++++++++++++++ .../Apache.Ignite.Core.csproj | 2 + .../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 4 +- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 90 ++++- .../Transactions/CacheTransactionManager.cs | 160 +++++++++ .../Impl/Transactions/Transaction.cs | 8 + .../Impl/Transactions/TransactionImpl.cs | 13 + .../Impl/Transactions/TransactionsImpl.cs | 10 + .../generator/ConfigurationGenerator.js | 9 +- 15 files changed, 641 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
