Merge remote-tracking branch 'remotes/origin/master' into ignite-2546
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8302aa34 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8302aa34 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8302aa34 Branch: refs/heads/ignite-2546 Commit: 8302aa34f98f5b01aa9f9f334a8a912212722ce7 Parents: 07e7df9 66f9a34 Author: Valentin Kulichenko <[email protected]> Authored: Wed Mar 23 15:31:29 2016 -0700 Committer: Valentin Kulichenko <[email protected]> Committed: Wed Mar 23 15:31:29 2016 -0700 ---------------------------------------------------------------------- .../processors/cache/GridCacheMapEntry.java | 8 +-- .../continuous/CacheContinuousQueryManager.java | 13 +++-- .../continuous/GridContinuousProcessor.java | 2 +- .../platform/cache/PlatformCache.java | 54 ++++++++++++++++++++ .../platform/utils/PlatformFutureUtils.java | 2 +- .../cache/IgniteCacheAbstractTest.java | 6 +++ .../IgniteCacheEntryListenerAbstractTest.java | 16 +++++- .../distributed/IgniteCacheManyClientsTest.java | 6 +++ ...ContinuousQueryFailoverAbstractSelfTest.java | 6 +++ .../Cache/CacheTestAsyncWrapper.cs | 12 +++++ .../Cache/Store/CacheStoreTest.cs | 31 +++++++++++ .../Cache/Store/CacheTestStore.cs | 2 +- .../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 26 ++++++++++ .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 17 ++++++ .../Apache.Ignite.Core/Impl/Cache/CacheOp.cs | 3 +- 15 files changed, 192 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
