Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5469b66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5469b66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5469b66 Branch: refs/heads/trunk Commit: d5469b66e965aab5b583255d93065981a74761f9 Parents: 1563837 ba7b0bd Author: Peter Schuller <peter.schul...@infidyne.com> Authored: Wed Feb 29 01:53:05 2012 -0800 Committer: Peter Schuller <peter.schul...@infidyne.com> Committed: Wed Feb 29 01:53:05 2012 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 8 ++++ src/java/org/apache/cassandra/config/Config.java | 2 + .../cassandra/config/DatabaseDescriptor.java | 10 ++++++ .../apache/cassandra/io/util/SequentialWriter.java | 26 ++++++++++++++- 5 files changed, 46 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5469b66/CHANGES.txt ----------------------------------------------------------------------
