Author: tucu
Date: Mon Feb 6 23:49:38 2012
New Revision: 1241267
URL: http://svn.apache.org/viewvc?rev=1241267&view=rev
Log:
Merge -r 1241264:1241265 from trunk to branch. FIXES: OOZIE-680
Modified:
incubator/oozie/branches/branch-3.1/release-log.txt
incubator/oozie/branches/branch-3.1/src/main/assemblies/distro.xml
Modified: incubator/oozie/branches/branch-3.1/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/release-log.txt?rev=1241267&r1=1241266&r2=1241267&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/release-log.txt (original)
+++ incubator/oozie/branches/branch-3.1/release-log.txt Mon Feb 6 23:49:38 2012
@@ -4,6 +4,7 @@ No new feature was added. Created to syn
-- Oozie 3.1.2 release
+OOZIE-680 oozie's assembly creates an extra level of empty subdirectory for
docs. (rvs via tucu)
OOZIE-38 LocalOozie example and improvement
OOZIE-580 use xml element to handle string escape when configure evaluator
OOZIE-585 Coordinator job fail to retrieve log with date range and action
range.
Modified: incubator/oozie/branches/branch-3.1/src/main/assemblies/distro.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/src/main/assemblies/distro.xml?rev=1241267&r1=1241266&r2=1241267&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/src/main/assemblies/distro.xml
(original)
+++ incubator/oozie/branches/branch-3.1/src/main/assemblies/distro.xml Mon Feb
6 23:49:38 2012
@@ -109,7 +109,7 @@
<!-- Oozie Documentation -->
<file>
<source>${basedir}/../docs/target/oozie-docs-${project.version}-docs.zip</source>
- <outputDirectory>//</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<destName>docs.zip</destName>
</file>
<!-- Oozie Client TAR.GZ -->
