You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/08/04 19:31:29 UTC

[1/2] incubator-ignite git commit: IGNITE-843 Tweak pom to build agent.

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-1155_1 d0871610f -> fae0422e6


IGNITE-843 Tweak pom to build agent.


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

Branch: refs/heads/ignite-1155_1
Commit: 3bb91df37a3cacbaa7843626f2d3925270a3049d
Parents: e85b2b4
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Aug 5 00:31:07 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Aug 5 00:31:07 2015 +0700

----------------------------------------------------------------------
 pom.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3bb91df3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4a19938..c23293a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,6 @@
         <module>modules/kafka</module>
         <module>modules/yarn</module>
         <module>modules/json</module>
-        <module>modules/schema-import-db</module>
     </modules>
 
     <profiles>
@@ -635,6 +634,7 @@
             </activation>
             <modules>
                 <module>modules/schema-import</module>
+                <module>modules/schema-import-db</module>
             </modules>
             <build>
                 <plugins>
@@ -691,6 +691,7 @@
             </activation>
             <modules>
                 <module>modules/schema-import</module>
+                <module>modules/schema-import-db</module>
             </modules>
             <build>
                 <plugins>
@@ -739,6 +740,14 @@
         </profile>
 
         <profile>
+            <id>control-center</id>
+            <modules>
+                <module>modules/control-center-agent</module>
+                <module>modules/schema-import-db</module>
+            </modules>
+        </profile>
+
+        <profile>
             <id>ignite-npm</id>
             <build>
                 <plugins>


[2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-1155_1' into ignite-1155_1

Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-1155_1' into ignite-1155_1


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

Branch: refs/heads/ignite-1155_1
Commit: fae0422e633e93144e017ca72b544add15228c67
Parents: 3bb91df d087161
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Aug 5 00:31:28 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Aug 5 00:31:28 2015 +0700

----------------------------------------------------------------------
 .../ignite/examples/ExampleNodeStartup.java     |  4 ++-
 .../JettyRestProcessorAbstractSelfTest.java     | 14 ++++++++
 .../cache/query/GridCacheQueryManager.java      | 37 ++++++++++++++++----
 .../cache/query/GridCacheSqlIndexMetadata.java  | 11 ++++--
 .../cache/query/GridCacheSqlMetadata.java       | 28 ++++++++++++---
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    | 10 +++---
 .../processors/rest/GridRestCommand.java        |  3 ++
 .../processors/rest/GridRestProcessor.java      |  5 +--
 .../handlers/cache/GridCacheCommandHandler.java | 14 +++++++-
 .../IgniteCacheAbstractFieldsQuerySelfTest.java | 14 ++++----
 modules/nodejs/src/main/js/cache.js             |  9 +++++
 .../http/jetty/GridJettyRestHandler.java        |  1 +
 12 files changed, 121 insertions(+), 29 deletions(-)
----------------------------------------------------------------------