You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wa...@apache.org on 2015/07/24 20:56:01 UTC
[2/2] hadoop git commit: HADOOP-11813. releasedocmaker.py should use
today's date instead of unreleased (Darrell Taylor via aw)
HADOOP-11813. releasedocmaker.py should use today's date instead of unreleased (Darrell Taylor via aw)
(cherry picked from commit f325522c1423f89dced999a16d49a004b2879743)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fed9f767
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fed9f767
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fed9f767
Branch: refs/heads/branch-2
Commit: fed9f767b1530a11e296f352955081d70dd883a1
Parents: 2a0688f
Author: Allen Wittenauer <aw...@apache.org>
Authored: Wed May 6 10:33:56 2015 -0700
Committer: Andrew Wang <wa...@apache.org>
Committed: Fri Jul 24 11:55:57 2015 -0700
----------------------------------------------------------------------
dev-support/releasedocmaker.py | 6 ++++++
hadoop-common-project/hadoop-common/CHANGES.txt | 7 ++++---
hadoop-common-project/hadoop-common/pom.xml | 1 +
3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fed9f767/dev-support/releasedocmaker.py
----------------------------------------------------------------------
diff --git a/dev-support/releasedocmaker.py b/dev-support/releasedocmaker.py
index 78c8e6b..2ccc1c0 100755
--- a/dev-support/releasedocmaker.py
+++ b/dev-support/releasedocmaker.py
@@ -18,6 +18,7 @@
from glob import glob
from optparse import OptionParser
+from time import gmtime, strftime
import os
import re
import sys
@@ -82,6 +83,7 @@ def notableclean(str):
str=str.replace("|","\|")
str=str.replace("<","\<")
str=str.replace(">","\>")
+ str=str.replace("*","\*")
str=str.rstrip()
return str
@@ -335,6 +337,8 @@ def main():
help="only create the master, merged project files")
parser.add_option("-i","--index", dest="index", action="store_true",
help="build an index file")
+ parser.add_option("-u","--usetoday", dest="usetoday", action="store_true",
+ help="use current date for unreleased versions")
(options, args) = parser.parse_args()
if (options.versions == None):
@@ -356,6 +360,8 @@ def main():
if version in releaseVersion:
reldate=releaseVersion[version]
+ elif options.usetoday:
+ reldate=strftime("%Y-%m-%d", gmtime())
else:
reldate="Unreleased"
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fed9f767/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index d3c6c00..f62c9f6 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -167,9 +167,10 @@ Release 2.8.0 - UNRELEASED
HADOOP-11958. MetricsSystemImpl fails to show backtrace when an error
occurs (Jason Lowe via jeagles)
- HADOOP-12158. Improve error message in
- TestCryptoStreamsWithOpensslAesCtrCryptoCodec when OpenSSL is not
- installed. (wang)
+ HADOOP-11813. releasedocmaker.py should use today's date instead of
+ unreleased (Darrell Taylor via aw)
+
+ BUG FIXES
HADOOP-12124. Add HTrace support for FsShell (cmccabe)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fed9f767/hadoop-common-project/hadoop-common/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 33bca02..6deadd8 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -812,6 +812,7 @@
<argument>--version</argument>
<argument>${project.version}</argument>
<argument>--index</argument>
+ <argument>--usetoday</argument>
</arguments>
</configuration>
</execution>