Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b0dada0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b0dada0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b0dada0c Branch: refs/heads/ignite-394 Commit: b0dada0c4fefc7682844789fac1250cf1f65d5c6 Parents: aba2b55 27d7d67 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Mar 5 17:36:03 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Mar 5 17:36:03 2015 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/internal/IgnitionEx.java | 4 ++-- .../internal/processors/cache/GridCacheAdapter.java | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
