HADOOP-11412 POMs mention "The Apache Software License" rather than "Apache
License". (Herve Boutemy via stevel)
(cherry picked from commit 07bb0b0bbb4732687c4992e8ce61a43ce8ba3db6)
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e71484be
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e71484be
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e71484be
Branch: refs/heads/branch-2
Commit: e71484be186f0405860a549b14669d0ac4247c91
Parents: 5c32c4b
Author: Steve Loughran <[email protected]>
Authored: Tue Dec 16 11:04:36 2014 +0000
Committer: cnauroth <[email protected]>
Committed: Wed Dec 17 14:57:13 2014 -0800
----------------------------------------------------------------------
hadoop-tools/hadoop-azure/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e71484be/hadoop-tools/hadoop-azure/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/pom.xml
b/hadoop-tools/hadoop-azure/pom.xml
index b428fb2..086a111 100644
--- a/hadoop-tools/hadoop-azure/pom.xml
+++ b/hadoop-tools/hadoop-azure/pom.xml
@@ -14,7 +14,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hadoop</groupId>