Merge remote-tracking branch 'remotes/origin/ignite-110' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25a61a5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25a61a5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25a61a5e Branch: refs/heads/ignite-32 Commit: 25a61a5ebd39f8c1cc2510adbba85fa6bdf72abe Parents: f8ecd87 9ec7c31 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jan 22 14:10:55 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jan 22 14:10:55 2015 +0300 ---------------------------------------------------------------------- .../examples/datagrid/CacheApiExample.java | 10 -- .../java/org/apache/ignite/IgniteCache.java | 172 +------------------ .../apache/ignite/IgniteCachingProvider.java | 2 +- .../org/apache/ignite/IgniteDataLoader.java | 20 ++- .../java/org/apache/ignite/cache/CacheFlag.java | 74 -------- .../processors/cache/IgniteCacheProxy.java | 95 ++-------- .../dataload/GridDataLoadCacheUpdaters.java | 6 +- .../dataload/GridDataLoadRequest.java | 36 +++- .../dataload/GridDataLoadUpdateJob.java | 12 +- .../dataload/GridDataLoaderProcessor.java | 13 +- .../dataload/IgniteDataLoaderImpl.java | 18 +- .../dr/GridDrDataLoadCacheUpdater.java | 2 +- .../cache/IgniteCacheInvokeAbstractTest.java | 4 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 2 +- .../GridCacheInterceptorAbstractSelfTest.java | 42 +---- .../GridCacheReturnValueTransferSelfTest.java | 3 +- .../distributed/GridCacheLockAbstractTest.java | 4 +- ...GridCacheValueConsistencyAtomicSelfTest.java | 4 +- .../GridDataLoaderProcessorSelfTest.java | 94 ++++++++++ 19 files changed, 216 insertions(+), 397 deletions(-) ----------------------------------------------------------------------
