Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-gg-10299
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea215003 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea215003 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea215003 Branch: refs/heads/ignite-998 Commit: ea21500336c6d0df5a563eb662367cce7aca0705 Parents: 0fc2d73 8467a3c Author: avinogradov <avinogra...@gridgain.com> Authored: Mon Jun 8 12:59:05 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Mon Jun 8 12:59:05 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 7 +- .../apache/ignite/internal/IgniteKernal.java | 2 + .../ignite/internal/IgniteNodeAttributes.java | 5 +- .../internal/MarshallerContextAdapter.java | 36 +- .../cache/DynamicCacheDescriptor.java | 17 + .../processors/cache/GridCacheContext.java | 13 + .../processors/cache/GridCacheProcessor.java | 37 ++- .../dht/atomic/GridDhtAtomicCache.java | 4 + .../transactions/IgniteTxLocalAdapter.java | 28 ++ .../IgniteTxRollbackCheckedException.java | 9 + ...acheReadOnlyTransactionalClientSelfTest.java | 327 +++++++++++++++++++ .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 2 + 13 files changed, 476 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
