Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/30932417 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30932417 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30932417 Branch: refs/heads/trunk Commit: 30932417122f5de01ff6beaf166f5e5b76aa5221 Parents: 388e1b2 742f6a3 Author: Jonathan Ellis <[email protected]> Authored: Thu Sep 19 17:47:49 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Sep 19 17:47:49 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
