Merge branches 'ignite-gg-10002' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10002
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/acb5d2b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/acb5d2b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/acb5d2b4 Branch: refs/heads/gg-9998 Commit: acb5d2b4c59bd6e17144195e36092f1cd41aaa96 Parents: aabe5a9 505a7bf Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Apr 2 10:42:21 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Apr 2 10:42:21 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteCacheAffinitySelfTest.java | 2 ++ .../cache/GridCacheOnCopyFlagAbstractSelfTest.java | 16 +++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) ----------------------------------------------------------------------