#Merge branch 'sprint-2' into ignite-326
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/00e11921 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00e11921 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00e11921 Branch: refs/heads/ignite-326 Commit: 00e119215f6b0ae0edd5488982d4c2cd610d0db8 Parents: be4881b 98f177f Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Wed Feb 25 13:51:44 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Wed Feb 25 13:52:10 2015 +0300 ---------------------------------------------------------------------- .../datagrid/CacheContinuousQueryExample.java | 6 +- .../ignite/codegen/MessageCodeGenerator.java | 28 +- .../cache/store/jdbc/CacheJdbcPojoStore.java | 28 +- .../processors/cache/GridCacheMapEntry.java | 562 +++++++++++-------- .../GridDistributedTxRemoteAdapter.java | 66 +-- .../dht/atomic/GridDhtAtomicCache.java | 44 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 84 +-- .../distributed/near/GridNearAtomicCache.java | 3 - .../cache/transactions/IgniteTxAdapter.java | 58 +- .../cache/transactions/IgniteTxEntry.java | 12 +- .../transactions/IgniteTxLocalAdapter.java | 48 +- .../cache/version/GridCacheVersion.java | 3 +- .../GridCacheVersionConflictContext.java | 35 +- .../cache/version/GridCacheVersionEx.java | 2 +- .../dr/GridDrDataLoadCacheUpdater.java | 6 +- .../near/IgniteCacheNearReadCommittedTest.java | 3 + .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- .../client/hadoop/GridHadoopClientProtocol.java | 3 +- .../hadoop/GridHadoopDefaultJobInfo.java | 5 +- 19 files changed, 559 insertions(+), 440 deletions(-) ----------------------------------------------------------------------
