You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2015/06/10 15:42:43 UTC
ambari git commit: Revert "AMBARI-11785. Ambari upgrade to 2.1
hangs.Part 2.(vbrodetskyi)"
Repository: ambari
Updated Branches:
refs/heads/trunk cd869694f -> 247a72cb1
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/247a72cb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/247a72cb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/247a72cb
Branch: refs/heads/trunk
Commit: 247a72cb1e1c2f05f1f3fd004aeb1de9c13e47d7
Parents: cd86969
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Wed Jun 10 08:19:53 2015 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Wed Jun 10 08:19:53 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/247a72cb/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());