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 aw...@apache.org on 2015/05/06 19:34:16 UTC
hadoop git commit: HADOOP-11813. releasedocmaker.py should use
today's date instead of unreleased (Darrell Taylor via aw)
Repository: hadoop
Updated Branches:
refs/heads/trunk 7a26d174a -> f325522c1
HADOOP-11813. releasedocmaker.py should use today's date instead of unreleased (Darrell Taylor via aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f325522c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f325522c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f325522c
Branch: refs/heads/trunk
Commit: f325522c1423f89dced999a16d49a004b2879743
Parents: 7a26d17
Author: Allen Wittenauer <aw...@apache.org>
Authored: Wed May 6 10:33:56 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Wed May 6 10:34:09 2015 -0700
----------------------------------------------------------------------
dev-support/releasedocmaker.py | 6 ++++++
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
hadoop-common-project/hadoop-common/pom.xml | 1 +
3 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f325522c/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/f325522c/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 adbe8b5..b89543d 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -209,6 +209,9 @@ Trunk (Unreleased)
HADOOP-11857. Fix CommandFormat#commandFormat java doc annotation.
(J.Andreina via jghoman)
+ HADOOP-11813. releasedocmaker.py should use today's date instead of
+ unreleased (Darrell Taylor via aw)
+
BUG FIXES
HADOOP-11473. test-patch says "-1 overall" even when all checks are +1
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f325522c/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 9ca2c9b..bb735c2 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -929,6 +929,7 @@
<argument>--version</argument>
<argument>${project.version}</argument>
<argument>--index</argument>
+ <argument>--usetoday</argument>
</arguments>
</configuration>
</execution>