merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51d71a79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51d71a79 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51d71a79 Branch: refs/heads/trunk Commit: 51d71a79b8f5be772396a2701687665cb83922f1 Parents: 61465c3 37ba434 Author: Pavel Yaskevich <xe...@apache.org> Authored: Sun Mar 10 15:38:05 2013 -0700 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Sun Mar 10 15:38:05 2013 -0700 ---------------------------------------------------------------------- .../org/apache/cassandra/hadoop/ConfigHelper.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/51d71a79/src/java/org/apache/cassandra/hadoop/ConfigHelper.java ----------------------------------------------------------------------
