Updated Branches: refs/heads/trunk ac0de1ee2 -> 927356e0c
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/927356e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/927356e0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/927356e0 Branch: refs/heads/trunk Commit: 927356e0c3db226669a29f6d880c74a1f84b3378 Parents: ac0de1e d5469b6 Author: Peter Schuller <[email protected]> Authored: Wed Feb 29 01:53:55 2012 -0800 Committer: Peter Schuller <[email protected]> Committed: Wed Feb 29 01:53:55 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/927356e0/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/927356e0/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/927356e0/src/java/org/apache/cassandra/io/util/SequentialWriter.java ----------------------------------------------------------------------
