Repository: hadoop Updated Branches: refs/heads/HDFS-EC 570914e8a -> 4acb20701
HADOOP-11441. Hadoop-azure: Change few methods scope to public. Contributed by Shashank Khandelwal. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/afac5500 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/afac5500 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/afac5500 Branch: refs/heads/HDFS-EC Commit: afac55005fb9119b6930d86eee375182e042aa11 Parents: a0501d0 Author: cnauroth <[email protected]> Authored: Thu Jan 29 13:07:51 2015 -0800 Committer: Zhe Zhang <[email protected]> Committed: Fri Jan 30 13:42:04 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java | 5 +++-- .../org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/afac5500/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 890a087..cc254e0 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -516,6 +516,9 @@ Release 2.7.0 - UNRELEASED HADOOP-10574. Bump the maven plugin versions too -moving the numbers into properties. (aajisaka) + HADOOP-11441. Hadoop-azure: Change few methods scope to public. + (Shashank Khandelwal via cnauroth) + OPTIMIZATIONS HADOOP-11323. WritableComparator#compare keeps reference to byte array. http://git-wip-us.apache.org/repos/asf/hadoop/blob/afac5500/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java index c091767..2412698 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/AzureNativeFileSystemStore.java @@ -789,8 +789,9 @@ public class AzureNativeFileSystemStore implements NativeFileSystemStore { STORAGE_EMULATOR_ACCOUNT_NAME_PROPERTY_NAME, DEFAULT_STORAGE_EMULATOR_ACCOUNT_NAME)); } - - static String getAccountKeyFromConfiguration(String accountName, + + @VisibleForTesting + public static String getAccountKeyFromConfiguration(String accountName, Configuration conf) throws KeyProviderException { String key = null; String keyProviderClass = conf.get(KEY_ACCOUNT_KEYPROVIDER_PREFIX http://git-wip-us.apache.org/repos/asf/hadoop/blob/afac5500/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java index a323237..b8ff912 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java @@ -482,7 +482,7 @@ public final class AzureBlobStorageTestAccount { return conf; } - static CloudStorageAccount createTestAccount() + public static CloudStorageAccount createTestAccount() throws URISyntaxException, KeyProviderException { return createTestAccount(createTestConfiguration());
