From 8d3ae4e34b71f761854c83b6b2c6ae3116fbc9aa Mon Sep 17 00:00:00 2001 From: Chris Nauroth Date: Mon, 17 Feb 2014 23:44:54 +0000 Subject: [PATCH] Merge trunk to HDFS-4685. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1569145 13f79535-47bb-0310-9956-ffa450edef68