HADOOP-10547: Merging r1591098 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591099 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arpit Agarwal 2014-04-29 20:43:42 +00:00
parent a325ab0e59
commit fa889d0ef6
2 changed files with 3 additions and 3 deletions

View File

@ -99,6 +99,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10508. RefreshCallQueue fails when authorization is enabled.
(Chris Li via wheat9)
HADOOP-10547. Give SaslPropertiesResolver.getDefaultProperties() public
scope. (Benoy Antony via Arpit Agarwal)
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES

View File

@ -165,9 +165,6 @@ Release 2.5.0 - UNRELEASED
HDFS-5892. TestDeleteBlockPool fails in branch-2. (Ted Yu via wheat9)
HADOOP-10547. Give SaslPropertiesResolver.getDefaultProperties() public
scope. (Benoy Antony via Arpit Agarwal)
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES