Updated Branches: refs/heads/trunk e30febf25 -> c3cbbe123
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3cbbe12 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3cbbe12 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3cbbe12 Branch: refs/heads/trunk Commit: c3cbbe123377da13bc20402143f821cf68c5a94c Parents: e30febf 05d4d3a Author: Pavel Yaskevich <[email protected]> Authored: Tue Mar 27 23:13:31 2012 +0300 Committer: Pavel Yaskevich <[email protected]> Committed: Tue Mar 27 23:13:31 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 + conf/cassandra.yaml | 4 +- src/java/org/apache/cassandra/config/Config.java | 2 +- .../cassandra/config/DatabaseDescriptor.java | 19 ++++++++++++++- 4 files changed, 23 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3cbbe12/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3cbbe12/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3cbbe12/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
