Merge remote-tracking branch 'remotes/origin/master' into ignite-1087
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f2511ff2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2511ff2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2511ff2 Branch: refs/heads/ignite-1087 Commit: f2511ff2a1846d6e32b62489e05a2586c415d307 Parents: 3aba787 bee6f68 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jul 9 18:06:24 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jul 9 18:06:24 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(-) ----------------------------------------------------------------------
