Merge branches 'ignite-32' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/582e8a59 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/582e8a59 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/582e8a59 Branch: refs/heads/ignite-32 Commit: 582e8a5919976863a4c3f7ba4c7b2cb3187e0fed Parents: 6c7da2c 5fd0d7c Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Dec 30 19:29:22 2014 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Dec 30 19:29:22 2014 +0700 ---------------------------------------------------------------------- .../org/gridgain/testframework/junits/GridAbstractTest.java | 5 +++-- .../gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
