Repository: oozie
Updated Branches:
  refs/heads/master d9209af99 -> 9528a5350


OOZIE-2519 Oozie HA with SSL info is slightly incorrect (andras.piros via 
rkanter)


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

Branch: refs/heads/master
Commit: 9528a5350a5d400e07823d7ca62332593fbc0a85
Parents: d9209af
Author: Robert Kanter <[email protected]>
Authored: Tue Jan 3 12:34:51 2017 -0800
Committer: Robert Kanter <[email protected]>
Committed: Tue Jan 3 12:35:25 2017 -0800

----------------------------------------------------------------------
 docs/src/site/twiki/AG_Install.twiki | 8 ++++----
 release-log.txt                      | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/9528a535/docs/src/site/twiki/AG_Install.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/AG_Install.twiki 
b/docs/src/site/twiki/AG_Install.twiki
index 0f26306..026b5d1 100644
--- a/docs/src/site/twiki/AG_Install.twiki
+++ b/docs/src/site/twiki/AG_Install.twiki
@@ -791,19 +791,19 @@ SSL certificate provided by the Oozie servers (so the 
load balancer does not nee
 documentation on how to configure this.  Make sure to point the load balancer 
at the https://HOST:HTTPS_PORT addresses for your
 Oozie servers.  Clients can then connect to the load balancer at 
https://LOAD_BALANCER_HOST:PORT.
 
-*Important:* Callbacks from the JobTracker/ResourceManager are done via http 
or https depending on what you enter for the
+*Important:* Callbacks from the ApplicationMaster are done via http or https 
depending on what you enter for the
 =OOZIE_BASE_URL= property.  If you are using a Certificate from a Certificate 
Authority, you can simply put the https address here.
 If you are using a self-signed certificate, you have to do one of the 
following options (Option 1 is recommended):
 
 Option 1) You'll need to follow the steps in
 the 
[[AG_Install#Configure_the_Oozie_Client_to_connect_using_SSL_HTTPS][Configure 
the Oozie Client to connect using SSL (HTTPS)]]
-section, but on the host of the JobTracker/ResourceManager.  You can then set 
=OOZIE_BASE_URL= to the load balancer https address.
-This will allow the JobTracker/ResourceManager to contact the Oozie server 
with https (like the Oozie client, they are also Java
+section, but on the host of the ApplicationMaster.  You can then set 
=OOZIE_BASE_URL= to the load balancer https address.
+This will allow the ApplicationMaster to contact the Oozie server with https 
(like the Oozie client, they are also Java
 programs).
 
 Option 2) You'll need setup another load balancer, or another "pool" on the 
existing load balancer, with the http addresses of the
 Oozie servers.  You can then set =OOZIE_BASE_URL= to the load balancer http 
address.  Clients should use the https load balancer
-address.  This will allow clients to use https while the 
JobTracker/ResourceManager uses http for callbacks.
+address.  This will allow clients to use https while the ApplicationMaster 
uses http for callbacks.
 
 ---+++ Fine Tuning an Oozie Server
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/9528a535/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 73f0a79..ec25fd3 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 4.4.0 release (trunk - unreleased)
 
+OOZIE-2519 Oozie HA with SSL info is slightly incorrect (andras.piros via 
rkanter)
 OOZIE-2757 Malformed xml is Spark action doc page (gezapeti via abhishekbafna)
 OOZIE-2616 Add Tez profile for Hive and Pig sharelibs (poeppt via rkanter)
 OOZIE-2741 Remove Tomcat (asasvari via rkanter)

Reply via email to