IGNITE-843 Merge ignite-1.5 into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/580d1a1d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/580d1a1d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/580d1a1d Branch: refs/heads/ignite-843-rc2 Commit: 580d1a1d0811ee1273badaf7fdabe2b8e8c1661b Parents: b90d3f7 Author: AKuznetsov <[email protected]> Authored: Thu Dec 17 20:59:38 2015 +0700 Committer: AKuznetsov <[email protected]> Committed: Thu Dec 17 20:59:38 2015 +0700 ---------------------------------------------------------------------- modules/control-center-agent/pom.xml | 2 +- modules/control-center-web/pom.xml | 2 +- modules/control-center-web/src/main/js/routes/agent.js | 4 ++-- modules/schema-import-db/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/580d1a1d/modules/control-center-agent/pom.xml ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/pom.xml b/modules/control-center-agent/pom.xml index 00916d5..85d76ea 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.5.0-b2-SNAPSHOT</version> + <version>1.5.0-final-SNAPSHOT</version> <properties> <jetty.version>9.2.12.v20150709</jetty.version> http://git-wip-us.apache.org/repos/asf/ignite/blob/580d1a1d/modules/control-center-web/pom.xml ---------------------------------------------------------------------- diff --git a/modules/control-center-web/pom.xml b/modules/control-center-web/pom.xml index c155b25..812e414 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.5.0-b2-SNAPSHOT</version> + <version>1.5.0-final-SNAPSHOT</version> <build> <plugins> http://git-wip-us.apache.org/repos/asf/ignite/blob/580d1a1d/modules/control-center-web/src/main/js/routes/agent.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/agent.js b/modules/control-center-web/src/main/js/routes/agent.js index f915df2..3c59150 100644 --- a/modules/control-center-web/src/main/js/routes/agent.js +++ b/modules/control-center-web/src/main/js/routes/agent.js @@ -45,7 +45,7 @@ router.get('/download/zip', function (req, res) { var JSZip = require('jszip'); var config = require('../helpers/configuration-loader.js'); - var agentFld = 'ignite-web-agent-1.5.0-b2-SNAPSHOT'; + var agentFld = 'ignite-web-agent-1.5.0-final-SNAPSHOT'; var agentZip = agentFld + '.zip'; // Read a zip file. @@ -86,7 +86,7 @@ router.post('/topology', function (req, res) { client.ignite().cluster(false).then(function (clusters) { var caches = clusters.map(function (cluster) { return Object.keys(cluster._caches).map(function (key) { - return {name: key, mode: cluster._caches[key]} + return {name: key, mode: cluster._caches[key]}; }); }); http://git-wip-us.apache.org/repos/asf/ignite/blob/580d1a1d/modules/schema-import-db/pom.xml ---------------------------------------------------------------------- diff --git a/modules/schema-import-db/pom.xml b/modules/schema-import-db/pom.xml index 7717472..405b905 100644 --- a/modules/schema-import-db/pom.xml +++ b/modules/schema-import-db/pom.xml @@ -32,7 +32,7 @@ </parent> <artifactId>ignite-schema-import-db</artifactId> - <version>1.5.0-b2-SNAPSHOT</version> + <version>1.5.0-final-SNAPSHOT</version> <dependencies> <dependency>
