You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ry...@apache.org on 2014/06/12 01:36:53 UTC

git commit: OOZIE-1869 Sharelib update shows vip/load balancer address as one of the hostname (puru via ryota)

Repository: oozie
Updated Branches:
  refs/heads/master b7f6cc319 -> ab3a17497


OOZIE-1869 Sharelib update shows vip/load balancer address as one of the hostname (puru via ryota)


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

Branch: refs/heads/master
Commit: ab3a17497b381e30416a145067c795cbe8e98193
Parents: b7f6cc3
Author: egashira <ry...@yahoo.com>
Authored: Wed Jun 11 16:36:32 2014 -0700
Committer: egashira <ry...@yahoo.com>
Committed: Wed Jun 11 16:36:32 2014 -0700

----------------------------------------------------------------------
 core/src/main/java/org/apache/oozie/servlet/BaseAdminServlet.java | 2 +-
 release-log.txt                                                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/ab3a1749/core/src/main/java/org/apache/oozie/servlet/BaseAdminServlet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/servlet/BaseAdminServlet.java b/core/src/main/java/org/apache/oozie/servlet/BaseAdminServlet.java
index 29d7bd6..0739cae 100644
--- a/core/src/main/java/org/apache/oozie/servlet/BaseAdminServlet.java
+++ b/core/src/main/java/org/apache/oozie/servlet/BaseAdminServlet.java
@@ -258,7 +258,7 @@ public abstract class BaseAdminServlet extends JsonRestServlet {
     private JSONObject updateLocalShareLib(HttpServletRequest request) {
         ShareLibService shareLibService = Services.get().get(ShareLibService.class);
         JSONObject json = new JSONObject();
-        json.put(JsonTags.SHARELIB_UPDATE_HOST, request.getServerName() + ":" + request.getServerPort());
+        json.put(JsonTags.SHARELIB_UPDATE_HOST, Services.get().getConf().get("oozie.base.url"));
         try {
             json.putAll(shareLibService.updateShareLib());
             json.put(JsonTags.SHARELIB_UPDATE_STATUS, "Successful");

http://git-wip-us.apache.org/repos/asf/oozie/blob/ab3a1749/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 08ecebe..e311c7f 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1869 Sharelib update shows vip/load balancer address as one of the hostname (puru via ryota)
 OOZIE-1861 Pig action should work with tez mode (rohini)
 OOZIE-1703 User should be able to set coord end-time before start time (puru via rohini)
 OOZIE-1715 Distributed ID sequence for HA (puru via rkanter)