Merge remote-tracking branch 'remotes/origin/master' into ignite-1087
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b50067ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b50067ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b50067ca Branch: refs/heads/ignite-1087 Commit: b50067ca4e077b61babc4859eeb3cf0e8ea5a21b Parents: f2511ff e3fba88 Author: sboikov <sboi...@gridgain.com> Authored: Fri Jul 10 09:37:18 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jul 10 09:37:18 2015 +0300 ---------------------------------------------------------------------- .../examples/ScalarCacheAffinityExample.scala | 2 +- .../scalar/examples/ScalarCacheExample.scala | 2 +- .../ScalarCachePopularNumbersExample.scala | 2 +- .../examples/ScalarCacheQueryExample.scala | 2 +- .../examples/ScalarSnowflakeSchemaExample.scala | 4 +- .../java/org/apache/ignite/IgniteCache.java | 14 +- .../org/apache/ignite/cache/CacheManager.java | 13 +- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../discovery/GridDiscoveryManager.java | 23 +- .../cache/DynamicCacheChangeRequest.java | 39 +- .../processors/cache/GridCacheGateway.java | 4 +- .../GridCachePartitionExchangeManager.java | 6 +- .../processors/cache/GridCacheProcessor.java | 102 ++- .../processors/cache/IgniteCacheProxy.java | 448 +++++++--- .../distributed/dht/GridDhtCacheEntry.java | 4 +- .../GridDhtPartitionsExchangeFuture.java | 30 +- .../datastreamer/DataStreamProcessor.java | 3 + .../visor/cache/VisorCacheStopTask.java | 2 +- .../affinity/IgniteClientNodeAffinityTest.java | 14 +- .../IgniteFairAffinityDynamicCacheSelfTest.java | 3 +- ...cheStoreSessionListenerAbstractSelfTest.java | 111 ++- .../GridCacheTxLoadFromStoreOnLockSelfTest.java | 34 +- .../CacheMetricsForClusterGroupSelfTest.java | 10 +- .../cache/CacheOffheapMapEntrySelfTest.java | 7 +- .../cache/CacheStopAndDestroySelfTest.java | 859 +++++++++++++++++++ ...eUsageMultinodeDynamicStartAbstractTest.java | 2 +- ...ProjectionForCachesOnDaemonNodeSelfTest.java | 2 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 140 +-- ...teCacheClientNodePartitionsExchangeTest.java | 29 +- ...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 2 +- .../DataStreamerMultinodeCreateCacheTest.java | 14 +- .../testsuites/IgniteCacheTestSuite4.java | 2 + .../CacheConfigurationP2PTestClient.java | 4 +- 33 files changed, 1596 insertions(+), 339 deletions(-) ----------------------------------------------------------------------
