Merge branch 'master' into ignite-gg-10507
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3681fcb2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3681fcb2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3681fcb2 Branch: refs/heads/ignite-gg-10507 Commit: 3681fcb2baad903000a4249ab532231924505827 Parents: acd8559 bee6f68 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Thu Jul 9 15:29:03 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Thu Jul 9 15:29:03 2015 +0300 ---------------------------------------------------------------------- .../ignite/testsuites/IgniteHadoopTestSuite.java | 2 +- .../util/spring/IgniteSpringHelperImpl.java | 10 +++++----- .../spring/IgniteExcludeInConfigurationTest.java | 5 ++++- .../org/apache/ignite/spring/sprint-exclude.xml | 19 +++++++++++++++++++ .../visor/commands/open/VisorOpenCommand.scala | 2 +- 5 files changed, 30 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
