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/11928f7d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11928f7d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11928f7d Branch: refs/heads/trunk Commit: 11928f7d8952d587337ddae77d8408156391e90d Parents: 2802849 d614566 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jul 15 16:10:30 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jul 15 16:10:30 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/11928f7d/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
