ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: Merge branches 'ignite-843' and 'master'
Date Fri, 18 Sep 2015 02:46:25 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 48b4cca14 -> 99600189a


Merge branches 'ignite-843' and 'master'


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

Branch: refs/heads/ignite-843
Commit: 99600189a754f3d696fd433e86f285ddcf64f0bf
Parents: 48b4cca
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Fri Sep 18 09:46:20 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Fri Sep 18 09:46:20 2015 +0700

----------------------------------------------------------------------
 modules/control-center-agent/pom.xml                               | 2 +-
 modules/control-center-web/pom.xml                                 | 2 +-
 .../rest/handlers/scripting/IgniteScriptingCommandHandler.java     | 2 +-
 modules/json/pom.xml                                               | 2 +-
 modules/nodejs/pom.xml                                             | 2 +-
 modules/schema-import-db/pom.xml                                   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/99600189/modules/control-center-agent/pom.xml
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/pom.xml b/modules/control-center-agent/pom.xml
index b7fe772..5204913 100644
--- a/modules/control-center-agent/pom.xml
+++ b/modules/control-center-agent/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-control-center-agent</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
     <properties>
         <jetty.version>9.2.12.v20150709</jetty.version>

http://git-wip-us.apache.org/repos/asf/ignite/blob/99600189/modules/control-center-web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/control-center-web/pom.xml b/modules/control-center-web/pom.xml
index 6dda423..d5241ca 100644
--- a/modules/control-center-web/pom.xml
+++ b/modules/control-center-web/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-control-center-web</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
     <build>
         <plugins>

http://git-wip-us.apache.org/repos/asf/ignite/blob/99600189/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
index afca1c5..ed8b759 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
@@ -119,7 +119,7 @@ public class IgniteScriptingCommandHandler extends GridRestCommandHandlerAdapter
             init = true;
         }
         catch (IgniteCheckedException e) {
-            ctx.log().error(e.getMessage());
+            ctx.log(getClass()).error(e.getMessage());
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/99600189/modules/json/pom.xml
----------------------------------------------------------------------
diff --git a/modules/json/pom.xml b/modules/json/pom.xml
index 29c7051..9821c67 100644
--- a/modules/json/pom.xml
+++ b/modules/json/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-json</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/ignite/blob/99600189/modules/nodejs/pom.xml
----------------------------------------------------------------------
diff --git a/modules/nodejs/pom.xml b/modules/nodejs/pom.xml
index d3ce4db..dd99580 100644
--- a/modules/nodejs/pom.xml
+++ b/modules/nodejs/pom.xml
@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-nodejs</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/ignite/blob/99600189/modules/schema-import-db/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schema-import-db/pom.xml b/modules/schema-import-db/pom.xml
index 3a11243..f42192e 100644
--- a/modules/schema-import-db/pom.xml
+++ b/modules/schema-import-db/pom.xml
@@ -32,6 +32,6 @@
     </parent>
 
     <artifactId>ignite-schema-import-db</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
 </project>


Mime
View raw message