Todd Lipcon 12bf674e8e Merge trunk into branch. ... Fixed a couple trivial conflicts due to HDFS-4363, which moved some methods from HdfsProtoUtil to PBHelper git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1433133 13f79535-47bb-0310-9956-ffa450edef68		2013-01-14 21:12:16 +00:00
..
hadoop-hdfs	Merge trunk into branch.	2013-01-14 21:12:16 +00:00
hadoop-hdfs-httpfs	HDFS-4385. Maven RAT plugin is not checking all source files (tgraves)	2013-01-14 14:36:40 +00:00
pom.xml	HDFS-4385. Maven RAT plugin is not checking all source files (tgraves)	2013-01-14 14:36:40 +00:00