Merge remote-tracking branch 'remotes/origin/master' into ignite-961
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4f8810ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4f8810ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4f8810ca Branch: refs/heads/ignite-1121 Commit: 4f8810ca4e855f9f2bcb14635d5f8bf48f2b844b Parents: b1e557c 13e55b2 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Jul 16 12:24:07 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Jul 16 12:24:07 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 8 + RELEASE_NOTES.txt | 2 + assembly/LICENSE_FABRIC | 317 +++++++++++ assembly/LICENSE_HADOOP | 270 ++++++++++ assembly/NOTICE_FABRIC | 13 + assembly/NOTICE_HADOOP | 12 + assembly/dependencies-fabric.xml | 13 + assembly/dependencies-hadoop.xml | 12 + assembly/dependencies-visor-console.xml | 20 +- assembly/release-base.xml | 10 - assembly/release-fabric.xml | 12 + assembly/release-hadoop.xml | 12 + examples/pom.xml | 2 +- modules/aop/licenses/aspectj-epl-license.txt | 69 --- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 48 ++ .../src/main/resources/META-INF/licenses.txt.vm | 44 ++ 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 +- .../apache/ignite/cache/CacheTypeMetadata.java | 53 +- .../discovery/GridDiscoveryManager.java | 35 +- .../processors/cache/GridCacheContext.java | 14 +- .../processors/cache/IgniteCacheFutureImpl.java | 6 + .../processors/cache/IgniteCacheProxy.java | 55 +- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 20 +- .../processors/query/GridQueryProcessor.java | 4 +- .../util/future/GridFutureChainListener.java | 4 - .../internal/util/future/IgniteFutureImpl.java | 12 +- .../plugin/security/SecuritySubjectType.java | 3 +- .../core/src/main/resources/ignite.properties | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 32 ++ .../GridCacheAbstractNodeRestartSelfTest.java | 12 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- ...acheAtomicReplicatedNodeRestartSelfTest.java | 14 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 6 +- modules/extdata/uri/pom.xml | 26 +- modules/gce/pom.xml | 2 +- .../geospatial/licenses/jts-lgpl-license.txt | 165 ------ modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- .../licenses/hibernate-lgpl-2.1-license.txt | 174 ------ modules/hibernate/pom.xml | 2 +- modules/indexing/licenses/h2-epl-license.txt | 69 --- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/licenses/jetty-epl-license.txt | 69 --- modules/mesos/pom.xml | 3 +- .../apache/ignite/mesos/ClusterProperties.java | 14 + .../apache/ignite/mesos/IgniteScheduler.java | 26 +- modules/rest-http/pom.xml | 8 +- .../scalar-2.10/licenses/scala-bsd-license.txt | 18 - modules/scalar-2.10/pom.xml | 2 +- modules/scalar/licenses/scala-bsd-license.txt | 18 - modules/scalar/pom.xml | 2 +- .../licenses/cron4j-lgpl-2.1-license.txt | 174 ------ modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/licenses/sl4j-mit-license.txt | 21 - modules/slf4j/pom.xml | 2 +- .../spark-2.10/licenses/scala-bsd-license.txt | 18 - modules/spark-2.10/pom.xml | 2 +- modules/spark/licenses/scala-bsd-license.txt | 18 - modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- .../apache/ignite/cache/spring/SpringCache.java | 2 +- .../ignite/cache/spring/SpringCacheManager.java | 22 +- modules/ssh/licenses/jcraft-revised-bsd.txt | 28 - modules/ssh/pom.xml | 2 +- modules/tools/licenses/jodd-revised-bsd.txt | 21 - modules/tools/pom.xml | 2 +- .../urideploy/licenses/jtidy-mit-license.txt | 50 -- modules/urideploy/pom.xml | 8 +- modules/visor-console-2.10/pom.xml | 2 +- .../licenses/jline-bsd-license.txt | 18 - .../licenses/scala-bsd-license.txt | 18 - modules/visor-console/pom.xml | 2 +- .../licenses/slf4j-mit-license.txt | 21 - modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 8 +- modules/yardstick/pom.xml | 2 +- modules/yarn/README.txt | 28 + modules/yarn/licenses/apache-2.0.txt | 202 +++++++ modules/yarn/pom.xml | 101 ++++ .../apache/ignite/yarn/ApplicationMaster.java | 400 ++++++++++++++ .../apache/ignite/yarn/ClusterProperties.java | 432 +++++++++++++++ .../org/apache/ignite/yarn/IgniteContainer.java | 84 +++ .../org/apache/ignite/yarn/IgniteProvider.java | 339 ++++++++++++ .../apache/ignite/yarn/IgniteYarnClient.java | 178 +++++++ .../org/apache/ignite/yarn/package-info.java | 22 + .../ignite/yarn/utils/IgniteYarnUtils.java | 81 +++ .../main/resources/ignite-default-config.xml | 35 ++ .../org/apache/ignite/IgniteYarnTestSuite.java | 38 ++ .../yarn/IgniteApplicationMasterSelfTest.java | 532 +++++++++++++++++++ parent/pom.xml | 55 ++ pom.xml | 4 +- 103 files changed, 3567 insertions(+), 1183 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f8810ca/examples/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f8810ca/parent/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f8810ca/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index af09219,344db40..771689b --- a/pom.xml +++ b/pom.xml @@@ -70,8 -71,8 +71,9 @@@ <module>modules/gce</module> <module>modules/cloud</module> <module>modules/mesos</module> + <module>modules/nodejs</module> <module>modules/kafka</module> + <module>modules/yarn</module> </modules> <profiles>
