Repository: incubator-ignite Updated Branches: refs/heads/ignite-1121 0dfb521a7 -> 6e8e922fa
# ignite-843 Fixed xml generation for client mode Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2ab4d67b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2ab4d67b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2ab4d67b Branch: refs/heads/ignite-1121 Commit: 2ab4d67b648676d4f7967c26d5bd9ec0e6f4a3f4 Parents: 400bc56 Author: Andrey <anovi...@gridgain.com> Authored: Thu Jul 16 16:12:20 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Jul 16 16:12:20 2015 +0700 ---------------------------------------------------------------------- .../web-control-center/nodejs/controllers/summary-controller.js | 2 +- modules/web-control-center/nodejs/routes/generator/xml.js | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ab4d67b/modules/web-control-center/nodejs/controllers/summary-controller.js ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/controllers/summary-controller.js b/modules/web-control-center/nodejs/controllers/summary-controller.js index 8679665..cb21e8b 100644 --- a/modules/web-control-center/nodejs/controllers/summary-controller.js +++ b/modules/web-control-center/nodejs/controllers/summary-controller.js @@ -32,7 +32,7 @@ controlCenterModule.controller('summaryController', ['$scope', '$http', 'commonF {value: undefined, label: 'Not set'} ]; - $scope.backupItem = {nearCacheEnabled: true}; + $scope.backupItem = {}; $http.get('/models/summary.json') .success(function (data) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ab4d67b/modules/web-control-center/nodejs/routes/generator/xml.js ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/routes/generator/xml.js b/modules/web-control-center/nodejs/routes/generator/xml.js index 8004c95..6fc7257 100644 --- a/modules/web-control-center/nodejs/routes/generator/xml.js +++ b/modules/web-control-center/nodejs/routes/generator/xml.js @@ -274,9 +274,6 @@ exports.generateClusterConfiguration = function(cluster, clientCache) { var cache = cluster.caches[i]; - if (clientCache) - _.merge(cache, clientCache); - generateCacheConfiguration(cache, res); }
