Merge branches 'ignite-141-2' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-141-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/c5355cd4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5355cd4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5355cd4 Branch: refs/heads/ignite-329 Commit: c5355cd45ef2e58d101c28c440aab44154bfeb20 Parents: bf013a3 ce2fa20 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Tue Mar 10 17:03:00 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Tue Mar 10 17:03:00 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/testframework/GridTestUtils.java | 4 ++-- modules/scalar/pom.xml | 8 ++++++++ .../ignite/scalar/testsuites/ScalarSelfTestSuite.scala | 6 ++++++ .../internal/websession/IgniteWebSessionSelfTestSuite.java | 6 ++++++ 4 files changed, 22 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
