Merge branch 'ignite-sprint-6' into ignite-695
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d590cfce Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d590cfce Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d590cfce Branch: refs/heads/ignite-695 Commit: d590cfceafccf59c99d99fe3d5141e8bd5e6da26 Parents: 3f695e6 593d862 Author: ashutak <ashu...@gridgain.com> Authored: Wed Jun 10 17:15:56 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Wed Jun 10 17:15:56 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 7 +++ examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- .../cloud/TcpDiscoveryCloudIpFinder.java | 25 +++++++--- .../TcpDiscoveryCloudIpFinderSelfTest.java | 3 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../internal/interop/InteropIgnition.java | 52 +++++++++++++++++++- .../internal/interop/InteropProcessor.java | 8 +++ .../core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- .../processors/hadoop/HadoopMapReduceTest.java | 21 +++++--- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 38 files changed, 128 insertions(+), 52 deletions(-) ----------------------------------------------------------------------
