You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/08 11:59:33 UTC
[13/17] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-5' into ignite-gg-10299
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-gg-10299
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0fc2d738
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0fc2d738
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0fc2d738
Branch: refs/heads/ignite-gg-10299
Commit: 0fc2d7384966fc13b7ba6f3e6adfc91068c489c9
Parents: 98176fe ab20fd9
Author: avinogradov <av...@gridgain.com>
Authored: Fri Jun 5 21:38:02 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Fri Jun 5 21:38:02 2015 +0300
----------------------------------------------------------------------
.../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(-)
----------------------------------------------------------------------