Updated Branches: refs/heads/cassandra-1.2 6caddcd91 -> feb7f2934
Merge branch 'cassandra-1.1' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/feb7f293 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/feb7f293 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/feb7f293 Branch: refs/heads/cassandra-1.2 Commit: feb7f29342ed845a462a89b0dec6c634a125dc5a Parents: 6caddcd a8c1043 Author: Aleksey Yeschenko <[email protected]> Authored: Mon Mar 11 19:42:10 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Mar 11 19:42:10 2013 +0300 ---------------------------------------------------------------------- .../cassandra/config/DatabaseDescriptor.java | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/feb7f293/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
