Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/318b00e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/318b00e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/318b00e2 Branch: refs/heads/trunk Commit: 318b00e25100b9261fa09e80b7a377963ef2608c Parents: 6b3b62f af1a9fe Author: Jonathan Ellis <[email protected]> Authored: Tue Jul 30 09:24:15 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Jul 30 09:24:15 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/hadoop/ConfigHelper.java | 10 ++++++++++ 1 file changed, 10 insertions(+) ----------------------------------------------------------------------
