Updated Branches: refs/heads/trunk 8e4abb220 -> 09b4e7bdf
Fix crazy automerge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09b4e7bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09b4e7bd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09b4e7bd Branch: refs/heads/trunk Commit: 09b4e7bdfb113715b3e1ae0be179415fab79d4b7 Parents: 8e4abb2 Author: Brandon Williams <[email protected]> Authored: Wed Apr 18 14:29:38 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Apr 18 14:29:38 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/hadoop/ConfigHelper.java | 25 --------------- 1 files changed, 0 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/09b4e7bd/src/java/org/apache/cassandra/hadoop/ConfigHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java index 68a8761..81dbf38 100644 --- a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java +++ b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java @@ -299,36 +299,11 @@ public class ConfigHelper 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); } - 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); - } - - public static String getOutputKeyspacePassword(Configuration conf) - { - return conf.get(OUTPUT_KEYSPACE_PASSWD_CONFIG); - } - public static String getInputColumnFamily(Configuration conf) { return conf.get(INPUT_COLUMNFAMILY_CONFIG);
