Author: brandonli
Date: Wed Aug 7 21:43:25 2013
New Revision: 1511510
URL: http://svn.apache.org/r1511510
Log:
HDFS-5071. Merging change r1511505 from branch-2
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml?rev=1511510&r1=1511509&r2=1511510&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
Wed Aug 7 21:43:25 2013
@@ -19,9 +19,9 @@ http://maven.apache.org/xsd/maven-4.0.0.
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-project-dist</artifactId>
+ <artifactId>hadoop-project</artifactId>
<version>2.1.1-SNAPSHOT</version>
- <relativePath>../../hadoop-project-dist</relativePath>
+ <relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-nfs</artifactId>
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1511510&r1=1511509&r2=1511510&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Wed Aug 7 21:43:25 2013
@@ -8,6 +8,8 @@ Release 2.1.1-beta - UNRELEASED
HDFS-4962 Use enum for nfs constants (Nicholas SZE via jing9)
+ HDFS-5071 Change hdfs-nfs parent project to hadoop-project (brandonli)
+
IMPROVEMENTS
HDFS-4513. Clarify in the WebHDFS REST API that all JSON respsonses may
