Merge remote-tracking branch 'origin/ignite-53' into ignite-53
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a4a2b1f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a4a2b1f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a4a2b1f2
Branch: refs/heads/ignite-86
Commit: a4a2b1f2488a106e5c4c64f8001aa88ca3fd2018
Parents: fbf6e60 a8f8766
Author: Yakov Zhdanov <[email protected]>
Authored: Thu Jan 22 21:14:49 2015 +0300
Committer: Yakov Zhdanov <[email protected]>
Committed: Thu Jan 22 21:14:49 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteCluster.java | 15 ++-
.../java/org/apache/ignite/IgniteEvents.java | 22 +++-
.../main/java/org/apache/ignite/IgniteFs.java | 5 +
.../java/org/apache/ignite/IgniteManaged.java | 18 ++-
.../java/org/apache/ignite/IgniteMessaging.java | 5 +-
.../query/GridCacheQueryFutureAdapter.java | 11 +-
.../cache/IgniteCacheInvokeReadThroughTest.java | 121 +++++++++++++++++++
.../cache/GridCacheAbstractFullApiSelfTest.java | 4 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 3 +-
.../bamboo/GridDataGridTestSuite.java | 3 +
10 files changed, 186 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4a2b1f2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
