Updated Branches:
  refs/heads/cassandra-1.1 ec242b7fc -> 6fcd1f470
  refs/heads/trunk bd7b20933 -> 92606cadb


merge


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

Branch: refs/heads/trunk
Commit: 92606cadbd48978188945f588469fe728e6dba99
Parents: f2152dd 6fcd1f4
Author: Brandon Williams <[email protected]>
Authored: Wed Apr 18 11:32:27 2012 -0500
Committer: Brandon Williams <[email protected]>
Committed: Wed Apr 18 11:32:27 2012 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/hadoop/ConfigHelper.java  |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/92606cad/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/ConfigHelper.java
index ea0ba79,87dd5e0..68a8761
--- a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
@@@ -296,20 -299,20 +296,30 @@@ public class ConfigHelpe
  
      public static String getInputKeyspacePassword(Configuration conf)
      {
 -      return conf.get(INPUT_KEYSPACE_PASSWD_CONFIG);
 +        return conf.get(INPUT_KEYSPACE_PASSWD_CONFIG);
 +    }
 +
 +    public static void setOutputKeyspaceUserName(Configuration conf, String 
username)
 +    {
 +        conf.set(OUTPUT_KEYSPACE_USERNAME_CONFIG, username);
      }
  
+     public static void setOutputKeyspaceUserName(Configuration conf, String 
username)
+     {
+         conf.set(OUTPUT_KEYSPACE_USERNAME_CONFIG, username);
+     }
+ 
      public static String getOutputKeyspaceUserName(Configuration conf)
      {
 -      return conf.get(OUTPUT_KEYSPACE_USERNAME_CONFIG);
 +        return conf.get(OUTPUT_KEYSPACE_USERNAME_CONFIG);
 +    }
 +
 +    public static void setOutputKeyspacePassword(Configuration conf, String 
password)
++    {
++        conf.set(OUTPUT_KEYSPACE_PASSWD_CONFIG, password);
+     }
+ 
+     public static void setOutputKeyspacePassword(Configuration conf, String 
password)
      {
          conf.set(OUTPUT_KEYSPACE_PASSWD_CONFIG, password);
      }

Reply via email to