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/04/03 05:50:43 UTC
hadoop git commit: HADOOP-11797. releasedocmaker.py needs to put ASF
headers on output (aw)
Repository: hadoop
Updated Branches:
refs/heads/trunk bad070fe1 -> 8d3c0f601
HADOOP-11797. releasedocmaker.py needs to put ASF headers on output (aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8d3c0f60
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8d3c0f60
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8d3c0f60
Branch: refs/heads/trunk
Commit: 8d3c0f601d549a22648050bcc9a0e4acf37edc81
Parents: bad070f
Author: Allen Wittenauer <aw...@apache.org>
Authored: Thu Apr 2 20:50:36 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Thu Apr 2 20:50:36 2015 -0700
----------------------------------------------------------------------
dev-support/releasedocmaker.py | 23 ++++++++++++++++++++
hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
2 files changed, 25 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8d3c0f60/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/8d3c0f60/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 260cc83..495c42d 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -431,6 +431,8 @@ Trunk (Unreleased)
HADOOP-11703. git should ignore .DS_Store files on Mac OS X (Abin Shahab
via aw)
+ HADOOP-11797. releasedocmaker.py needs to put ASF headers on output (aw)
+
OPTIMIZATIONS
HADOOP-7761. Improve the performance of raw comparisons. (todd)