Merge branches 'ignite-sprint-3-p1' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c6a70e76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c6a70e76 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c6a70e76 Branch: refs/heads/ignite-646 Commit: c6a70e76e2403045d87d4452fe89a0e17e8b7a8f Parents: dc455be 82ea2cf Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Apr 22 09:39:02 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Apr 22 09:39:02 2015 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/cache/CacheInterceptor.java | 9 ++++++--- .../org/apache/ignite/internal/MarshallerContextImpl.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
