
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
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