Updated Branches: refs/heads/cassandra-1.2 1108ede0f -> 994d2625b refs/heads/trunk acbff934f -> edd5caa45
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/edd5caa4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edd5caa4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edd5caa4 Branch: refs/heads/trunk Commit: edd5caa45453c491d3c8728784a67993151b9261 Parents: acbff93 994d262 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Jan 16 08:51:10 2013 -0800 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Jan 16 08:51:10 2013 -0800 ---------------------------------------------------------------------- .../cassandra/config/DatabaseDescriptor.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/edd5caa4/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
