From a9fb0a42b92e6267f265d2697f03fccf2e8119d0 Mon Sep 17 00:00:00 2001
From: Chris Nauroth <cnauroth@apache.org>
Date: Wed, 19 Feb 2014 17:40:06 +0000
Subject: [PATCH] Merge trunk to HDFS-4685.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1569848 13f79535-47bb-0310-9956-ffa450edef68