Brandon Li c1452c4722 Merging change r1615801 from trunk ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615802 13f79535-47bb-0310-9956-ffa450edef68		2014-08-04 21:33:10 +00:00
..
dev-support	HDFS-3050. svn merge -c 1309629 from trunk	2012-04-05 00:03:58 +00:00
hadoop-hdfs	Merging change r1615801 from trunk	2014-08-04 21:33:10 +00:00
hadoop-hdfs-httpfs	HDFS-6632. Reintroduce dfs.http.port / dfs.https.port in branch-2. Contributed by Yongjun Zhang.	2014-07-18 20:35:02 +00:00
hadoop-hdfs-nfs	HDFS-6451. Merging change r1615702 from trunk	2014-08-04 17:44:45 +00:00
pom.xml	Preparing for 2.6.0 development. Updated versions.	2014-07-03 06:11:57 +00:00