You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mr...@apache.org on 2018/05/03 17:25:23 UTC
[ambari] branch branch-feature-AMBARI-14714 updated (b6d82fe ->
f32f21f)
This is an automated email from the ASF dual-hosted git repository.
mradhakrishnan pushed a change to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git.
from b6d82fe [AMBARI-23726] Mpack Installation Response is not Updating State - missed commit
add fa5469a Revert "Revert "Merge branch-feature-AMBARI-14714-configs to branch-feature-AMBARI-14714""
add 66b8b06 Merge remote-tracking branch 'upstream/branch-feature-AMBARI-14714' into branch-feature-AMBARI-14714-configs
add 0f4f52e [AMBARI-23644] Handle back end issues related to new Service Config API - agent caching
add 9308a86 Ambari 23644 Handle back end issues related to new Service Config API
new f32f21f Merge pull request #1145 from apache/branch-feature-AMBARI-14714-configs
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../controller/AmbariManagementControllerImpl.java | 3 +
ambari-web/app/controllers/wizard.js | 2 +-
.../app/controllers/wizard/step8_controller.js | 102 ++++++++---------
.../app/controllers/wizard/step9_controller.js | 4 +-
.../app/mixins/common/configs/configs_saver.js | 3 +-
ambari-web/app/utils/ajax/ajax.js | 9 +-
ambari-web/test/controllers/wizard/step8_test.js | 35 ++----
.../mixins/common/configs/configs_saver_test.js | 124 +++++++++++----------
8 files changed, 139 insertions(+), 143 deletions(-)
--
To stop receiving notification emails like this one, please contact
mradhakrishnan@apache.org.
[ambari] 01/01: Merge pull request #1145 from
apache/branch-feature-AMBARI-14714-configs
Posted by mr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mradhakrishnan pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit f32f21f4648fe26d45d22bfd379c01c8831919ad
Merge: b6d82fe 9308a86
Author: mradha25 <mr...@hortonworks.com>
AuthorDate: Thu May 3 10:25:20 2018 -0700
Merge pull request #1145 from apache/branch-feature-AMBARI-14714-configs
Branch feature ambari 14714 configs
.../controller/AmbariManagementControllerImpl.java | 3 +
ambari-web/app/controllers/wizard.js | 2 +-
.../app/controllers/wizard/step8_controller.js | 102 ++++++++---------
.../app/controllers/wizard/step9_controller.js | 4 +-
.../app/mixins/common/configs/configs_saver.js | 3 +-
ambari-web/app/utils/ajax/ajax.js | 9 +-
ambari-web/test/controllers/wizard/step8_test.js | 35 ++----
.../mixins/common/configs/configs_saver_test.js | 124 +++++++++++----------
8 files changed, 139 insertions(+), 143 deletions(-)
diff --cc ambari-web/app/controllers/wizard/step9_controller.js
index 55397bb,1785a94..6e87ad6
--- a/ambari-web/app/controllers/wizard/step9_controller.js
+++ b/ambari-web/app/controllers/wizard/step9_controller.js
@@@ -522,10 -522,10 +522,10 @@@ App.WizardStep9Controller = App.WizardS
serviceGroups = this.get('content.serviceGroups');
promises = serviceGroups.map(sg => {
- data.serviceGroup = sg;
+ data.serviceGroupName = sg;
return App.ajax.send({
- name: 'common.services.update',
+ name: 'common.services.update', //TODO: This should change to use common.services.update.all when that is implemented on the back end.
sender: this,
data: data,
success: 'launchStartServicesSuccessCallback',
@@@ -544,10 -544,10 +544,10 @@@
serviceGroups = this.get('content.serviceGroups');
promises = serviceGroups.map(sg => {
- data.serviceGroup = sg;
+ data.serviceGroupName = sg;
return App.ajax.send({
- name: 'common.services.update',
+ name: 'common.services.update', //TODO: This should change to use common.services.update.all when that is implemented on the back end.
sender: this,
data: data,
success: 'launchStartServicesSuccessCallback',
diff --cc ambari-web/app/utils/ajax/ajax.js
index de4c16f,fb54510..8a9ed87
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@@ -56,29 -56,8 +56,29 @@@ var urls =
}
},
+ 'common.services.update.all' : {
+ 'real': '/clusters/{clusterName}/servicegroups?{urlParams}',
+ 'format': function (data) {
+ return {
+ type: 'PUT',
+ data: JSON.stringify({
+ RequestInfo: {
+ "context": data.context,
+ "operation_level": {
+ "level": "CLUSTER",
+ "cluster_name" : data.clusterName
+ }
+ },
+ Body: {
+ ServiceInfo: data.ServiceInfo
+ }
+ })
+ };
+ }
+ },
+
'common.services.update' : {
- 'real': '/clusters/{clusterName}/servicegroups/{serviceGroup}/services?{urlParams}',
+ 'real': '/clusters/{clusterName}/servicegroups/{serviceGroupName}/services?{urlParams}',
'mock': '/data/wizard/deploy/poll_1.json',
'format': function (data) {
return {
--
To stop receiving notification emails like this one, please contact
mradhakrishnan@apache.org.