You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2016/03/09 17:36:57 UTC
[1/2] ambari git commit: AMBARI-15352 Property 'CPU Scheduling' not
present for Yarn configs in Ambari2.2.2.0.(ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 e7e6c91d0 -> 9c13134c2
AMBARI-15352 Property 'CPU Scheduling' not present for Yarn configs in Ambari2.2.2.0.(ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c13134c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c13134c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c13134c
Branch: refs/heads/branch-2.2
Commit: 9c13134c20d33aae0d8e9a18034f398c1f71534d
Parents: d614bd1
Author: ababiichuk <ab...@hortonworks.com>
Authored: Wed Mar 9 15:38:19 2016 +0200
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Wed Mar 9 18:36:40 2016 +0200
----------------------------------------------------------------------
ambari-web/app/utils/config.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9c13134c/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index c7c061e..ec8299f 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -965,12 +965,15 @@ App.config = Em.Object.create({
if (!t.get('isAdvanced') && t.get('serviceName') === serviceName) {
t.get('sections').forEach(function (s) {
s.get('subSections').forEach(function (ss) {
- properties = properties.concat(ss.get('configProperties'));
+ var configIds = ss.get('configProperties').map(function(p) {
+ return App.config.configId(p.get('name'), p.get('filename'));
+ });
+ properties = properties.concat(configIds);
});
});
}
}, this);
- return properties.mapProperty('id');
+ return properties;
},
/**
[2/2] ambari git commit: AMBARI-15344 Grafana: UI edits related to
Admin username + password.(ababiichuk)
Posted by ab...@apache.org.
AMBARI-15344 Grafana: UI edits related to Admin username + password.(ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d614bd1f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d614bd1f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d614bd1f
Branch: refs/heads/branch-2.2
Commit: d614bd1f62908c5d6a11f9f421007150e84fd757
Parents: e7e6c91
Author: ababiichuk <ab...@hortonworks.com>
Authored: Wed Mar 9 11:50:20 2016 +0200
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Wed Mar 9 18:36:40 2016 +0200
----------------------------------------------------------------------
.../AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d614bd1f/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml
index f400da2..a863214 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml
@@ -40,7 +40,7 @@
<property>
<name>metrics_grafana_username</name>
<value>admin</value>
- <display-name>Metrics Grafana Admin Username</display-name>
+ <display-name>Grafana Admin Username</display-name>
<description>
Metrics Grafana Username. This value cannot be modified by Ambari
except on initial install. Please make sure the username change in
@@ -55,7 +55,7 @@
<name>metrics_grafana_password</name>
<value></value>
<property-type>PASSWORD</property-type>
- <display-name>Metrics Grafana Admin Password</display-name>
+ <display-name>Grafana Admin Password</display-name>
<description>
Metrics Grafana password. This value cannot be modified by Ambari
except on initial install. Please make sure the password change in