You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/12/01 10:02:57 UTC
[45/50] [abbrv] ignite git commit: IGNITE-2015 Fixed marshaller
selection.
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-rc2
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": {