ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vbrodets...@apache.org
Subject ambari git commit: Revert "AMBARI-11785. Ambari upgrade to 2.1 hangs.Part 2.(vbrodetskyi)"
Date Wed, 10 Jun 2015 13:43:55 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 3d5c4cea0 -> 6dbaee423


Revert "AMBARI-11785. Ambari upgrade to 2.1 hangs.Part 2.(vbrodetskyi)"


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6dbaee42
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6dbaee42
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6dbaee42

Branch: refs/heads/branch-2.1
Commit: 6dbaee4237a71281f3bab43c94e10521b77dda66
Parents: 3d5c4ce
Author: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Authored: Wed Jun 10 08:21:19 2015 +0300
Committer: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Committed: Wed Jun 10 08:21:19 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6dbaee42/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index 98d84e7..85cf39a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -1068,7 +1068,8 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog {
             String source = oozieWebUIAlertDefinitionEntity.getSource();
             JsonObject rootJson = new JsonParser().parse(source).getAsJsonObject();
             rootJson.get("uri").getAsJsonObject().remove("http");
-            rootJson.get("uri").getAsJsonObject().addProperty("http", "{{oozie-site/oozie.base.url}}/?user.name=oozie");
+            rootJson.get("uri").getAsJsonObject().addProperty("http",
+                    "{{oozie-site/oozie.base.url}}/?user.name={{oozie-env/oozie_user}}");
 
             // save the changes
             updateAlertDefinitionEntitySource("oozie_server_webui", rootJson.toString());


Mime
View raw message