Merge remote-tracking branch 'remotes/origin/ignite-sprint-6' into ignite-950
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/10b02260 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/10b02260 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/10b02260 Branch: refs/heads/ignite-950 Commit: 10b022602104963c61d146daec3fd33bec98ce5f Parents: b78653d d699faa Author: Denis Magda <dma...@gridgain.com> Authored: Fri Jun 19 13:31:14 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Fri Jun 19 13:31:14 2015 +0300 ---------------------------------------------------------------------- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../core/src/main/resources/ignite.properties | 2 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 44 ++++++++++++++++++-- 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 +- 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/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +- modules/spark/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-2.10/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, 78 insertions(+), 40 deletions(-) ----------------------------------------------------------------------
