Updated Branches: refs/heads/cassandra-1.2 dfc7b2753 -> 0f7521526 refs/heads/cassandra-1.2.0 8a96ec702 -> 40e22489c refs/heads/trunk 513f0a065 -> 19b96b5da
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/19b96b5d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19b96b5d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19b96b5d Branch: refs/heads/trunk Commit: 19b96b5da5e65a61338e3c601828039d0eda8bb4 Parents: 513f0a0 0f75215 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Dec 4 21:58:32 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Dec 4 21:58:32 2012 -0600 ---------------------------------------------------------------------- test/conf/cassandra.yaml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
