ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [50/50] incubator-ignite git commit: Merge tag '1.3.1'
Date Thu, 16 Jul 2015 07:16:16 GMT
Merge tag '1.3.1'

community version 1.3.1 release (REV c559692d6b3aa96316dc0c9b2874c67179489a87)

Conflicts:
	examples/pom.xml
	modules/aop/pom.xml
	modules/aws/pom.xml
	modules/clients/pom.xml
	modules/cloud/pom.xml
	modules/codegen/pom.xml
	modules/core/pom.xml
	modules/core/src/main/resources/ignite.properties
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
	modules/extdata/p2p/pom.xml
	modules/extdata/uri/modules/uri-dependency/pom.xml
	modules/extdata/uri/pom.xml
	modules/gce/pom.xml
	modules/geospatial/pom.xml
	modules/hadoop/pom.xml
	modules/hibernate/pom.xml
	modules/indexing/pom.xml
	modules/jcl/pom.xml
	modules/jta/pom.xml
	modules/kafka/pom.xml
	modules/log4j/pom.xml
	modules/mesos/pom.xml
	modules/rest-http/pom.xml
	modules/scalar-2.10/pom.xml
	modules/scalar/pom.xml
	modules/schedule/pom.xml
	modules/schema-import/pom.xml
	modules/slf4j/pom.xml
	modules/spark-2.10/pom.xml
	modules/spark/pom.xml
	modules/spring/pom.xml
	modules/ssh/pom.xml
	modules/tools/pom.xml
	modules/urideploy/pom.xml
	modules/visor-console-2.10/pom.xml
	modules/visor-console/pom.xml
	modules/visor-plugins/pom.xml
	modules/web/pom.xml
	modules/yardstick/pom.xml
	pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/13e55b24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/13e55b24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/13e55b24

Branch: refs/heads/master
Commit: 13e55b2469c3fb00bf7f1726e5ade1594d476c72
Parents: 77da728 c559692
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Thu Jul 16 10:14:58 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Thu Jul 16 10:14:58 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 +
 modules/aop/licenses/aspectj-epl-license.txt    |  69 ---
 modules/apache-license-gen/pom.xml              |  48 ++
 .../src/main/resources/META-INF/licenses.txt.vm |  44 ++
 .../processors/cache/IgniteCacheFutureImpl.java |   6 +
 .../processors/cache/IgniteCacheProxy.java      |  55 +-
 .../util/future/GridFutureChainListener.java    |   4 -
 .../internal/util/future/IgniteFutureImpl.java  |  12 +-
 .../plugin/security/SecuritySubjectType.java    |   3 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  32 ++
 .../geospatial/licenses/jts-lgpl-license.txt    | 165 ------
 .../licenses/hibernate-lgpl-2.1-license.txt     | 174 ------
 modules/indexing/licenses/h2-epl-license.txt    |  69 ---
 modules/mesos/licenses/jetty-epl-license.txt    |  69 ---
 modules/mesos/pom.xml                           |   1 +
 .../apache/ignite/mesos/ClusterProperties.java  |  14 +
 .../apache/ignite/mesos/IgniteScheduler.java    |  26 +-
 modules/rest-http/pom.xml                       |   6 +-
 .../scalar-2.10/licenses/scala-bsd-license.txt  |  18 -
 modules/scalar/licenses/scala-bsd-license.txt   |  18 -
 .../licenses/cron4j-lgpl-2.1-license.txt        | 174 ------
 modules/slf4j/licenses/sl4j-mit-license.txt     |  21 -
 .../spark-2.10/licenses/scala-bsd-license.txt   |  18 -
 modules/spark/licenses/scala-bsd-license.txt    |  18 -
 modules/ssh/licenses/jcraft-revised-bsd.txt     |  28 -
 modules/tools/licenses/jodd-revised-bsd.txt     |  21 -
 .../urideploy/licenses/jtidy-mit-license.txt    |  50 --
 modules/urideploy/pom.xml                       |   6 +-
 .../licenses/jline-bsd-license.txt              |  18 -
 .../licenses/scala-bsd-license.txt              |  18 -
 .../licenses/slf4j-mit-license.txt              |  21 -
 modules/web/pom.xml                             |   6 +-
 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                                         |   2 +
 58 files changed, 3420 insertions(+), 1042 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/13e55b24/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index f8d1ce3,0a8f87c..fb004bf
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@@ -61,8 -61,15 +61,16 @@@ import static org.apache.ignite.transac
  /**
   * Full API cache test.
   */
 +@SuppressWarnings("TransientFieldInNonSerializableClass")
  public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstractSelfTest
{
+     /** */
+     public static final CacheEntryProcessor<String, Integer, String> ERR_PROCESSOR
=
+         new CacheEntryProcessor<String, Integer, String>() {
+             @Override public String process(MutableEntry<String, Integer> e, Object...
args) {
+                 throw new RuntimeException("Failed!");
+             }
+         };
+ 
      /** Increment processor for invoke operations. */
      public static final EntryProcessor<String, Integer, String> INCR_PROCESSOR = new
EntryProcessor<String, Integer, String>() {
          @Override public String process(MutableEntry<String, Integer> e, Object...
args) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/13e55b24/modules/mesos/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/13e55b24/modules/rest-http/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/13e55b24/modules/urideploy/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/13e55b24/modules/web/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/13e55b24/parent/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/13e55b24/pom.xml
----------------------------------------------------------------------


Mime
View raw message