You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2015/01/29 22:12:19 UTC

[2/2] hadoop git commit: HADOOP-11441. Hadoop-azure: Change few methods scope to public. Contributed by Shashank Khandelwal.

HADOOP-11441. Hadoop-azure: Change few methods scope to public. Contributed by Shashank Khandelwal.

(cherry picked from commit ad55083f75cb920fde58302d7bc8857086c1978c)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fa2378d8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fa2378d8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fa2378d8

Branch: refs/heads/branch-2
Commit: fa2378d866ce93249ac82988421374919691c486
Parents: 6efffc9
Author: cnauroth <cn...@apache.org>
Authored: Thu Jan 29 13:07:51 2015 -0800
Committer: cnauroth <cn...@apache.org>
Committed: Thu Jan 29 13:07:59 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/fa2378d8/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 f28243b..9a060c2 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -155,6 +155,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/fa2378d8/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/fa2378d8/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());