Merge branches 'ignite-96' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-96
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a7b090b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a7b090b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a7b090b Branch: refs/heads/ignite-189 Commit: 2a7b090b749f14b013acaa49255eecdcf9baab6c Parents: 0135a4c b434ae8 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Feb 12 10:40:54 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Feb 12 10:40:54 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheAdapter.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a7b090b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
