Merge remote-tracking branch 'origin/sprint-2' into sprint-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/42f138a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/42f138a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/42f138a0 Branch: refs/heads/ignite-344 Commit: 42f138a05f1308ff38a52e22aaaef7540d2420e8 Parents: b08bfe7 8c49ff6 Author: Artem Shutak <ashu...@gridgain.com> Authored: Fri Feb 27 17:35:04 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Fri Feb 27 17:35:04 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/cluster/ClusterMetrics.java | 2 +- .../ignite/testframework/config/GridTestProperties.java | 10 +++++----- modules/extdata/p2p/pom.xml | 6 ------ .../ignite/client/hadoop/GridHadoopClientProtocol.java | 2 +- .../processors/hadoop/GridHadoopClassLoader.java | 12 ++++++------ .../internal/processors/hadoop/GridHadoopSetup.java | 8 ++++---- .../client/hadoop/GridHadoopClientProtocolSelfTest.java | 6 +++--- modules/hibernate/pom.xml | 6 ------ modules/indexing/pom.xml | 6 ------ modules/jta/pom.xml | 6 ------ modules/scalar/pom.xml | 6 ------ modules/spring/pom.xml | 6 ------ modules/visor-console/pom.xml | 7 ------- modules/web/pom.xml | 6 ------ 14 files changed, 20 insertions(+), 69 deletions(-) ----------------------------------------------------------------------
