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:00 UTC
[1/2] hadoop git commit: HADOOP-11797. releasedocmaker.py needs to
put ASF headers on output (aw)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 d2ee02940 -> fed9f767b
HADOOP-11797. releasedocmaker.py needs to put ASF headers on output (aw)
(cherry picked from commit 8d3c0f601d549a22648050bcc9a0e4acf37edc81)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2a0688fd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2a0688fd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2a0688fd
Branch: refs/heads/branch-2
Commit: 2a0688fdb820ff1563198e546717cb5d3cb93adc
Parents: d2ee029
Author: Allen Wittenauer <aw...@apache.org>
Authored: Thu Apr 2 20:50:36 2015 -0700
Committer: Andrew Wang <wa...@apache.org>
Committed: Fri Jul 24 11:55:56 2015 -0700
----------------------------------------------------------------------
dev-support/releasedocmaker.py | 23 ++++++++++++++++++++
hadoop-common-project/hadoop-common/CHANGES.txt | 6 ++---
2 files changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2a0688fd/dev-support/releasedocmaker.py
----------------------------------------------------------------------
diff --git a/dev-support/releasedocmaker.py b/dev-support/releasedocmaker.py
index b00c1a7..78c8e6b 100755
--- a/dev-support/releasedocmaker.py
+++ b/dev-support/releasedocmaker.py
@@ -30,6 +30,26 @@ except ImportError:
releaseVersion={}
namePattern = re.compile(r' \([0-9]+\)')
+asflicense='''
+<!---
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+-->
+'''
+
def clean(str):
return tableclean(re.sub(namePattern, "", str))
@@ -357,6 +377,9 @@ def main():
"%(ver)s/CHANGES.%(key)s.%(ver)s.md",
["HADOOP","HDFS","MAPREDUCE","YARN"], {"ver":maxVersion, "date":reldate})
+ reloutputs.writeAll(asflicense)
+ choutputs.writeAll(asflicense)
+
relhead = '# Hadoop %(key)s %(ver)s Release Notes\n\n' \
'These release notes cover new developer and user-facing incompatibilities, features, and major improvements.\n\n'
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2a0688fd/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 ed86e2e..d3c6c00 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -504,11 +504,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12235 hadoop-openstack junit & mockito dependencies should be
"provided". (Ted Yu via stevel)
- HADOOP-12209 Comparable type should be in FileStatus.
- (Yong Zhang via stevel)
+ HADOOP-11797. releasedocmaker.py needs to put ASF headers on output (aw)
- HADOOP-12088. KMSClientProvider uses equalsIgnoreCase("application/json").
- (Brahma Reddy Battula via stevel)
+ OPTIMIZATIONS
HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()
over getMessage() in logging/span events. (Varun Saxena via stevel)
[2/2] hadoop git commit: HADOOP-11813. releasedocmaker.py should use
today's date instead of unreleased (Darrell Taylor via aw)
Posted by wa...@apache.org.
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>