You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/09/04 16:26:38 UTC
ambari git commit: AMBARI-13013. 'Metrics and Expression' window is
empty for Number widget. Fix merge conflict issue. (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 a9d52fad8 -> fa8625557
AMBARI-13013. 'Metrics and Expression' window is empty for Number widget. Fix merge conflict issue. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fa862555
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fa862555
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fa862555
Branch: refs/heads/branch-2.1
Commit: fa862555779237cc63ff5d66b594b16f50d33323
Parents: a9d52fa
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Sep 4 17:26:31 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri Sep 4 17:26:31 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/admin/kerberos.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa862555/ambari-web/app/controllers/main/admin/kerberos.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos.js b/ambari-web/app/controllers/main/admin/kerberos.js
index db67545..8052704 100644
--- a/ambari-web/app/controllers/main/admin/kerberos.js
+++ b/ambari-web/app/controllers/main/admin/kerberos.js
@@ -533,7 +533,7 @@ App.MainAdminKerberosController = App.KerberosWizardStep4Controller.extend({
} else {
this.restartServicesAfterRegenerate(false, callback);
}
- }
+ },
/**
* List of the warnings regarding specific services before enabling/disabling Kerberos.