Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 2f7b80dc4 -> 869593849
IGNITE-2015 Fixed marshaller selection.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b79a700e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b79a700e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b79a700e
Branch: refs/heads/ignite-843-rc1
Commit: b79a700e31e0d9e083e273400514d4e2c91d119e
Parents: 2f7b80d
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Dec 1 15:22:03 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Dec 1 15:22:03 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/clusters-controller.js | 2 +-
.../src/main/js/controllers/models/clusters.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b79a700e/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 96a42a7..cfe3409 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -121,7 +121,7 @@ consoleModule.controller('clustersController', [
$scope.segmentationPolicy = $common.mkOptions(['RESTART_JVM', 'STOP', 'NOOP']);
- $scope.marshallers = $common.mkOptions(['OptimizedMarshaller', 'JdkMarshaller']);
+ $scope.marshallers = $common.mkOptions(['OptimizedMarshaller', 'JdkMarshaller', undefined]);
$scope.sslKeyAlgorithms = ['SumX509', 'X509'];
http://git-wip-us.apache.org/repos/asf/ignite/blob/b79a700e/modules/control-center-web/src/main/js/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index 96ac6bd..7947fea 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -1319,7 +1319,7 @@
"items": "marshallers",
"tip": [
"Instance of marshaller to use in grid",
- "If not provided, OptimizedMarshaller will be used on Java HotSpot VM, and JdkMarshaller will be used on other VMs"
+ "If not provided, BinaryMarshaller will be used"
],
"details": {
"OptimizedMarshaller": {
IGNITE-843 Updated pom.xml generation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/86959384
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/86959384
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/86959384
Branch: refs/heads/ignite-843-rc1
Commit: 869593849367f095fb94858efec3a7a2de15d03f
Parents: b79a700
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Dec 1 15:23:07 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Dec 1 15:23:07 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/summary-controller.js | 2 +-
.../src/main/js/helpers/generator/generator-common.js | 2 +-
.../src/main/js/helpers/generator/generator-pom.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/86959384/modules/control-center-web/src/main/js/controllers/summary-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/summary-controller.js b/modules/control-center-web/src/main/js/controllers/summary-controller.js
index d4d3c58..0cbbd2f 100644
--- a/modules/control-center-web/src/main/js/controllers/summary-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js
@@ -19,7 +19,7 @@
consoleModule.controller('summaryController', [
'$scope', '$http', '$common', '$loading', '$message', '$table',
function ($scope, $http, $common, $loading, $message, $table) {
- var igniteVersion = '1.5.0-IWC';
+ var igniteVersion = '1.5.0';
$scope.panelExpanded = $common.panelExpanded;
$scope.tableVisibleRow = $table.tableVisibleRow;
http://git-wip-us.apache.org/repos/asf/ignite/blob/86959384/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
index c0bbdea..b56f2b1 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
@@ -20,7 +20,7 @@ $generatorCommon = {};
// Add leading zero.
$generatorCommon.addLeadingZero = function (numberStr, minSize) {
- if (typeof (numberStr) != 'string')
+ if (typeof (numberStr) !== 'string')
numberStr = '' + numberStr;
while (numberStr.length < minSize) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/86959384/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js b/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
index c4e5e45..aff8307 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
@@ -129,7 +129,7 @@ $generatorPom.pom = function (cluster, igniteVersion, res) {
res.startBlock('<repositories>');
res.startBlock('<repository>');
$generatorPom.addProperty(res, 'id', 'GridGain External Repository');
- $generatorPom.addProperty(res, 'url', 'http://www.gridgainsystems.com/nexus/content/repositories/gridgain_staging-1555');
+ $generatorPom.addProperty(res, 'url', 'http://www.gridgainsystems.com/nexus/content/repositories/gridgain_staging-1584');
res.endBlock('</repository>');
res.endBlock('</repositories>');