Merge branch 'master' into oya
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/0e9e5e38 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/0e9e5e38 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/0e9e5e38 Branch: refs/heads/oya Commit: 0e9e5e3801f0d6aaad4a7c6c8a9b74e75296a0b6 Parents: 80854d1 9d58f9a Author: Gezapeti Cseh <[email protected]> Authored: Wed May 10 15:31:45 2017 -0700 Committer: Gezapeti Cseh <[email protected]> Committed: Wed May 10 15:31:45 2017 -0700 ---------------------------------------------------------------------- docs/src/site/twiki/DG_QuickStart.twiki | 6 ++++-- docs/src/site/twiki/ENG_Building.twiki | 6 ++++-- pom.xml | 2 +- release-log.txt | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/0e9e5e38/docs/src/site/twiki/DG_QuickStart.twiki ---------------------------------------------------------------------- diff --cc docs/src/site/twiki/DG_QuickStart.twiki index 607fd7f,7ea87c7..8c3d664 --- a/docs/src/site/twiki/DG_QuickStart.twiki +++ b/docs/src/site/twiki/DG_QuickStart.twiki @@@ -41,7 -41,11 +41,9 @@@ suitable when same oozie package needs 2. Build with -Puber which will bundle the required libraries in the oozie war. Further, the following options are available to customise the versions of the dependencies: --P<profile> - default hadoop-2. Valid are hadoop-1, hadoop-2 or hadoop-3. Choose the correct hadoop -profile depending on the hadoop version used. +-Dhadoop.version=<version> - default 2.6.0 + -Ptez - Bundle tez jars in hive and pig sharelibs. Useful if you want to use tez + +as the execution engine for those applications. --Dhadoop.version=<version> - default 1.2.1 for hadoop-1, 2.6.0 for hadoop-2 and 3.0.0-SNAPSHOT for hadoop-3 -Dhadoop.auth.version=<version> - defaults to hadoop version -Ddistcp.version=<version> - defaults to hadoop version -Dpig.version=<version> - default 0.16.0 http://git-wip-us.apache.org/repos/asf/oozie/blob/0e9e5e38/docs/src/site/twiki/ENG_Building.twiki ---------------------------------------------------------------------- diff --cc docs/src/site/twiki/ENG_Building.twiki index 67540dd,535f1b0..3d23b26 --- a/docs/src/site/twiki/ENG_Building.twiki +++ b/docs/src/site/twiki/ENG_Building.twiki @@@ -211,7 -211,11 +211,9 @@@ $ bin/mkdistro.sh [-DskipTests Running =mkdistro.sh= will create the binary distribution of Oozie. The following options are available to customise the versions of the dependencies: -Puber - Bundle required hadoop and hcatalog libraries in oozie war - -Dhadoop.version=<version> - default 2.4.0 --P<profile> - default hadoop-2. Valid are hadoop-1, hadoop-2 or hadoop-3. Choose the correct hadoop -profile depending on the hadoop version used. ++-Dhadoop.version=<version> - default 2.6.0 + -Ptez - Bundle tez jars in hive and pig sharelibs. Useful if you want to use tez + as the execution engine for those applications. --Dhadoop.version=<version> - default 1.2.1 for hadoop-1, 2.6.0 for hadoop-2 and 3.0.0-SNAPSHOT for hadoop-3 -Dhadoop.auth.version=<version> - defaults to hadoop version -Ddistcp.version=<version> - defaults to hadoop version -Dpig.version=<version> - default 0.16.0 http://git-wip-us.apache.org/repos/asf/oozie/blob/0e9e5e38/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/0e9e5e38/release-log.txt ----------------------------------------------------------------------
