Merge branches 'ignite-99-2' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-99-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/885e7635 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/885e7635 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/885e7635 Branch: refs/heads/ignite-99-2 Commit: 885e76358a1e7ca51a4eea7e06502b95fe1a3065 Parents: 52033a9 15cbff4 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Jan 23 19:42:48 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Jan 23 19:42:48 2015 +0300 ---------------------------------------------------------------------- .../datagrid/CacheTransactionExample.java | 2 +- .../examples/ScalarCacheQueryExample.scala | 3 +- .../client/impl/ClientCacheFlagsCodecTest.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 16 +-- .../apache/ignite/cache/CacheAtomicityMode.java | 2 +- .../apache/ignite/cache/CacheConfiguration.java | 8 +- .../org/apache/ignite/cache/CacheEntry.java | 12 +- .../java/org/apache/ignite/cache/CacheFlag.java | 110 ------------------- .../apache/ignite/cache/CacheFlagException.java | 67 ----------- .../cache/CachePartialUpdateException.java | 6 +- .../apache/ignite/cache/CacheProjection.java | 1 + .../java/org/apache/ignite/cache/GridCache.java | 2 +- .../apache/ignite/cache/cloner/CacheCloner.java | 2 +- .../internal/processors/cache/CacheFlag.java | 110 +++++++++++++++++++ .../processors/cache/CacheFlagException.java | 67 +++++++++++ .../CachePartialUpdateCheckedException.java | 64 +++++++++++ .../processors/cache/GridCacheAdapter.java | 2 +- .../cache/GridCacheConcurrentMap.java | 2 +- .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../processors/cache/GridCacheMvccManager.java | 3 +- .../processors/cache/GridCacheProjectionEx.java | 24 ++-- .../cache/GridCacheSharedContext.java | 5 +- .../processors/cache/IgniteCacheProxy.java | 4 +- .../GridCacheDataStructuresManager.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 12 +- .../dht/colocated/GridDhtColocatedCache.java | 2 +- .../distributed/near/GridNearAtomicCache.java | 2 +- .../distributed/near/GridNearCacheAdapter.java | 2 +- .../near/GridNearTransactionalCache.java | 2 +- .../local/atomic/GridLocalAtomicCache.java | 16 +-- .../GridCacheContinuousQueryEntry.java | 2 +- .../transactions/IgniteTransactionsImpl.java | 2 +- .../apache/ignite/transactions/IgniteTx.java | 2 +- .../GridCacheAbstractProjectionSelfTest.java | 4 +- .../GridCacheReturnValueTransferSelfTest.java | 2 +- .../cache/IgniteCacheInvokeAbstractTest.java | 2 +- .../GridCacheAbstractJobExecutionTest.java | 2 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 1 + .../GridCachePartitionedProjectionSelfTest.java | 2 +- .../GridCacheReplicatedProjectionSelfTest.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 3 +- .../p2p/GridAbstractMultinodeRedeployTest.java | 2 +- 45 files changed, 329 insertions(+), 261 deletions(-) ----------------------------------------------------------------------
