Updated Branches: refs/heads/trunk 09b4e7bdf -> 65d51bb74
Fix the fix of the crazy automerge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65d51bb7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65d51bb7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65d51bb7 Branch: refs/heads/trunk Commit: 65d51bb747cc5b7f60a58793026529cb4c6bdf1d Parents: 09b4e7b Author: Brandon Williams <[email protected]> Authored: Wed Apr 18 14:44:58 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Apr 18 14:44:58 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/hadoop/ConfigHelper.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/65d51bb7/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 81dbf38..8ec215e 100644 --- a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java +++ b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java @@ -304,6 +304,11 @@ public class ConfigHelper return conf.get(OUTPUT_KEYSPACE_USERNAME_CONFIG); } + 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);
