ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [3/3] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-164v2' into ignite-164v2
Date Thu, 05 Feb 2015 10:02:31 GMT
Merge remote-tracking branch 'origin/ignite-164v2' into ignite-164v2

Conflicts:
	modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java


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

Branch: refs/heads/ignite-164v2
Commit: 467bfa985ca6b8e296f6b4b464262c2c9d03d9f7
Parents: b4b954c 15e8b40
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Thu Feb 5 13:02:07 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Thu Feb 5 13:02:07 2015 +0300

----------------------------------------------------------------------
 config/java.util.logging.properties                          | 2 +-
 config/router/default-router.xml                             | 4 ++--
 modules/aop/src/test/config/aop/jboss/jboss-gridgain-aop.xml | 2 +-
 .../java/org/apache/ignite/client/GridClientCompute.java     | 4 ++--
 .../java/org/apache/ignite/compute/ComputeJobContext.java    | 2 +-
 .../main/java/org/apache/ignite/compute/gridify/Gridify.java | 2 +-
 .../org/apache/ignite/compute/gridify/GridifySetToSet.java   | 2 +-
 .../org/apache/ignite/compute/gridify/GridifySetToValue.java | 2 +-
 .../org/apache/ignite/configuration/IgniteConfiguration.java | 4 ++--
 .../apache/ignite/configuration/IgniteDeploymentMode.java    | 2 +-
 .../java/org/apache/ignite/internal/GridKernalContext.java   | 4 ++--
 .../apache/ignite/spi/authentication/AuthenticationSpi.java  | 2 +-
 .../java/org/apache/ignite/spi/deployment/DeploymentSpi.java | 2 +-
 .../java/org/apache/ignite/spi/discovery/DiscoverySpi.java   | 2 +-
 .../core/src/test/config/load/dsi-49-server-production.xml   | 2 +-
 modules/core/src/test/config/log4j-test.xml                  | 2 +-
 .../apache/ignite/fs/hadoop/GridGgfsHadoopParameters.java    | 2 +-
 .../apache/ignite/fs/hadoop/v1/GridGgfsHadoopFileSystem.java | 2 +-
 .../apache/ignite/fs/hadoop/v2/GridGgfsHadoopFileSystem.java | 2 +-
 .../ignite/cache/hibernate/GridHibernateRegionFactory.java   | 8 ++++----
 .../ignite/util/antgar/IgniteDeploymentGarAntTask.java       | 2 +-
 .../apache/ignite/cache/websession/GridWebSessionFilter.java | 6 +++---
 22 files changed, 31 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/467bfa98/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java
----------------------------------------------------------------------
diff --cc modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java
index d4a70a3,23d4c3c..45bdc17
--- a/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java
+++ b/modules/tools/src/main/java/org/apache/ignite/util/antgar/IgniteDeploymentGarAntTask.java
@@@ -38,8 -38,8 +38,8 @@@ import java.io.*
   * </ul>
   */
  public class IgniteDeploymentGarAntTask extends Zip {
-     /** GAR descriptor name. Its value is {@code gridgain.xml}. */
+     /** GAR descriptor name. Its value is {@code ignite.xml}. */
 -    public static final String DESC_NAME = "gridgain.xml";
 +    public static final String DESC_NAME = "ignite.xml";
  
      /**  Default descriptor path. */
      private static final String DESC_PATH = "META-INF";


Mime
View raw message