Updated Branches: refs/heads/trunk e79d9fbf8 -> 1c017e0d8
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/1c017e0d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c017e0d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c017e0d Branch: refs/heads/trunk Commit: 1c017e0d8a7c2dde08347b89b109c4a99d19bb00 Parents: e79d9fb feb7f29 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Mar 11 19:43:54 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Mar 11 19:43:54 2013 +0300 ---------------------------------------------------------------------- .../cassandra/config/DatabaseDescriptor.java | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c017e0d/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
