Merge remote-tracking branch 'origin/ignite-59' into ignite-59
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/521ac9e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/521ac9e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/521ac9e2 Branch: refs/heads/ignite-54 Commit: 521ac9e264b0375827b6318666802525623bae5d Parents: d787b5f 0379c59 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Jan 19 16:50:38 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Jan 19 16:50:38 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteCacheProxy.java | 55 ++++++++------ .../processors/cache/GridCacheAdapter.java | 20 ++++- .../cache/GridCacheBasicApiAbstractTest.java | 79 ++++++++++++++++++++ 3 files changed, 129 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/521ac9e2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
