Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0f33ffc3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0f33ffc3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0f33ffc3 Branch: refs/heads/ignite-99 Commit: 0f33ffc3d50e959026533a386486e9422414f29a Parents: 2f5d4d8 bb32d46 Author: sboikov <sboi...@gridgain.com> Authored: Tue Jan 13 16:05:51 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Jan 13 16:05:51 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 39 ++--- .../processors/cache/IgniteCacheProxy.java | 124 +++++++++++++- .../GridCacheLoadOnlyStoreAdapterSelfTest.java | 5 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../cache/GridCacheAbstractSelfTest.java | 4 +- .../dht/GridCacheGlobalLoadTest.java | 163 +++++++++++++++++++ .../GridCachePartitionedLoadCacheSelfTest.java | 20 ++- .../junits/common/GridCommonAbstractTest.java | 7 + .../bamboo/GridDataGridTestSuite.java | 1 + 9 files changed, 328 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33ffc3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33ffc3/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33ffc3/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java ----------------------------------------------------------------------
