Merge branches 'ignite-941' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-941
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/59db4a5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/59db4a5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/59db4a5e Branch: refs/heads/ignite-sprint-5 Commit: 59db4a5e0f1dd83d56cb95f0a4184451f0a387fd Parents: b4d1915 ab20fd9 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Fri Jun 5 13:55:21 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Fri Jun 5 13:55:21 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 11 ++ .../affinity/GridAffinityProcessor.java | 23 ++++- .../processors/cache/GridCacheAdapter.java | 17 ++- .../processors/cache/GridCacheProxyImpl.java | 14 ++- .../processors/cache/IgniteCacheProxy.java | 23 +++++ .../processors/cache/IgniteInternalCache.java | 11 +- .../datastreamer/DataStreamerImpl.java | 92 ++++++++++++----- .../processors/igfs/IgfsMetaManager.java | 2 +- .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../VisorCacheConfigurationCollectorJob.java | 6 +- .../internal/visor/cache/VisorCacheMetrics.java | 19 ++-- .../cache/VisorCacheMetricsCollectorTask.java | 10 +- .../cache/VisorCacheStoreConfiguration.java | 5 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 83 +++++++++++++++ .../GridCacheExAbstractFullApiSelfTest.java | 103 ------------------- .../GridCacheExColocatedFullApiSelfTest.java | 33 ------ .../near/GridCacheExNearFullApiSelfTest.java | 39 ------- .../GridCacheExReplicatedFullApiSelfTest.java | 33 ------ .../local/GridCacheExLocalFullApiSelfTest.java | 30 ------ .../DataStreamerMultiThreadedSelfTest.java | 59 ++++++++--- .../IgniteMessagingWithClientTest.java | 2 + .../IgniteCacheFullApiSelfTestSuite.java | 6 -- 22 files changed, 309 insertions(+), 314 deletions(-) ----------------------------------------------------------------------
