From 15b9077c2d41f59c716582d8f7ae6e334630c0ac Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Tue, 13 May 2014 20:43:31 +0000
Subject: [PATCH] Branching from trunk for HADOOP-10150 and HDFS-6134 at
 1594374

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1594376 13f79535-47bb-0310-9956-ffa450edef68