Repository: oozie Updated Branches: refs/heads/master e1b8cee36 -> 740778d86
OOZIE-3168 Remove -secure option from DG_QuickStart.twiki and from oozie-setup.sh Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/740778d8 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/740778d8 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/740778d8 Branch: refs/heads/master Commit: 740778d86e964ab1a079913a987a235020b6394c Parents: e1b8cee Author: Gezapeti Cseh <gezap...@apache.org> Authored: Mon Feb 5 16:34:54 2018 +0100 Committer: Gezapeti Cseh <gezap...@apache.org> Committed: Mon Feb 5 16:35:24 2018 +0100 ---------------------------------------------------------------------- distro/src/main/bin/oozie-setup.sh | 4 ---- docs/src/site/twiki/DG_QuickStart.twiki | 3 --- release-log.txt | 1 + 3 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/740778d8/distro/src/main/bin/oozie-setup.sh ---------------------------------------------------------------------- diff --git a/distro/src/main/bin/oozie-setup.sh b/distro/src/main/bin/oozie-setup.sh index e431acc..0b3974e 100644 --- a/distro/src/main/bin/oozie-setup.sh +++ b/distro/src/main/bin/oozie-setup.sh @@ -123,7 +123,6 @@ additionalDir="" extjsHome="" jarsPath="" prepareWar="" -secure="" while [ $# -gt 0 ] do @@ -161,9 +160,6 @@ do ${JAVA_BIN} ${OOZIE_OPTS} -cp ${OOZIECPPATH} org.apache.oozie.tools.OozieDBImportCLI "${@}" fi exit $? - elif [ "$1" = "-secure" ]; then - shift - secure=true elif [ "$1" = "-d" ]; then shift additionalDir=$1 http://git-wip-us.apache.org/repos/asf/oozie/blob/740778d8/docs/src/site/twiki/DG_QuickStart.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/DG_QuickStart.twiki b/docs/src/site/twiki/DG_QuickStart.twiki index e3bdf32..cc1bb6d 100644 --- a/docs/src/site/twiki/DG_QuickStart.twiki +++ b/docs/src/site/twiki/DG_QuickStart.twiki @@ -151,9 +151,6 @@ make sure you specify the location of a truststore that contains required certif =oozie.https.truststore.file= in =oozie-site.xml=, or by setting the =javax.net.ssl.trustStore= system property. If it is set in both places, the value passed as system property will be used. -The =-secure= option will configure Oozie to use HTTP (SSL); refer to -[[AG_Install#Setting_Up_Oozie_with_HTTPS_SSL][Setting Up Oozie with HTTPS (SSL)]] for more details. - Create the Oozie DB using the 'ooziedb.sh' command line tool: <verbatim> http://git-wip-us.apache.org/repos/asf/oozie/blob/740778d8/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 20ce6e5..ccea120 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3168 Remove -secure option from DG_QuickStart.twiki and from oozie-setup.sh (kmarton via gezapeti) OOZIE-1717 Add indexes to speed up db queries (asasvari) OOZIE-3157 Setup truststore so that it also works in HTTP only mode (kmarton via asasvari) OOZIE-3166 Remove tomcat alias from AG_Install.twiki: To use a Self-Signed Certificate part (kmarton via andras.piros)
