You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2014/07/23 02:48:38 UTC
git commit: AMBARI-6568. Service pluggability: New added services in
the stack has Add Property link in log-4j and env categories (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk e784e2631 -> 69f2bcf99
AMBARI-6568. Service pluggability: New added services in the stack has Add Property link in log-4j and env categories (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/69f2bcf9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/69f2bcf9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/69f2bcf9
Branch: refs/heads/trunk
Commit: 69f2bcf99f161f2a80919410274424f1fc8bcf0e
Parents: e784e26
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Tue Jul 22 17:48:05 2014 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Tue Jul 22 17:48:19 2014 -0700
----------------------------------------------------------------------
ambari-web/app/config.js | 2 +-
ambari-web/app/models/stack_service.js | 2 +-
ambari-web/test/utils/component_test.js | 25 -------------------------
3 files changed, 2 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/69f2bcf9/ambari-web/app/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 37eb065..35800b7 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -78,7 +78,7 @@ App.supports = {
jobs: true,
ubuntu: true,
views: false,
- flume: false,
+ flume: true,
databaseConnection: true
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/69f2bcf9/ambari-web/app/models/stack_service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js
index a39bd3c..1d210d3 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -424,7 +424,7 @@ App.StackService.configCategories = function () {
var configTypes = Object.keys(this.get('configTypes')).without('core-site').without('global');
configTypes.forEach(function (type) {
var displayName = 'Custom ' + type;
- var canAddProperty = !type.endsWith('-log4j') || !type.endsWith('-env');
+ var canAddProperty = !(type.endsWith('-log4j') || type.endsWith('-env'));
var siteFileName = type + '.xml';
serviceConfigCategories.pushObject(App.ServiceConfigCategory.create({ name: 'Advanced ' + type, displayName: displayName, siteFileName: siteFileName,
canAddProperty: canAddProperty}));
http://git-wip-us.apache.org/repos/asf/ambari/blob/69f2bcf9/ambari-web/test/utils/component_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/component_test.js b/ambari-web/test/utils/component_test.js
deleted file mode 100644
index a304d17..0000000
--- a/ambari-web/test/utils/component_test.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var App = require('app');
-var component = require('utils/component');
-require('models/host_component');
-require('models/stack_service_component');
-
-describe('utils/component', function(){
-});