merge from ignite-790 to ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2b02dd02 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2b02dd02 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2b02dd02 Branch: refs/heads/ignite-545 Commit: 2b02dd0269f93a4817daf7c6c19b2ed8301b693c Parents: ac399d9 5e28951 Author: Denis Magda <dma...@gridgain.com> Authored: Wed Apr 29 13:47:35 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Wed Apr 29 13:47:35 2015 +0300 ---------------------------------------------------------------------- modules/cloud/README.txt | 32 ++ modules/cloud/licenses/apache-2.0.txt | 202 +++++++++ modules/cloud/pom.xml | 108 +++++ .../cloud/TcpDiscoveryCloudIpFinder.java | 433 +++++++++++++++++++ .../tcp/ipfinder/cloud/package-info.java | 21 + .../TcpDiscoveryCloudIpFinderSelfTest.java | 124 ++++++ .../tcp/ipfinder/cloud/package-info.java | 22 + .../ignite/testsuites/IgniteCloudTestSuite.java | 112 +++++ .../discovery/tcp/TcpDiscoverySpiAdapter.java | 10 +- pom.xml | 1 + 10 files changed, 1062 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2b02dd02/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 200a84d,6585c37..2a45704 --- a/pom.xml +++ b/pom.xml @@@ -76,7 -75,7 +76,8 @@@ <module>modules/jcl</module> <module>modules/schema-import</module> <module>modules/codegen</module> + <module>modules/gce</module> + <module>modules/cloud</module> </modules> <profiles>
