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/03a1fb10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03a1fb10 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03a1fb10 Branch: refs/heads/trunk Commit: 03a1fb10fbb3fdc760e607e96190dcb5691da327 Parents: 0e4bf09 c3ff774 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri May 10 08:53:34 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri May 10 08:53:34 2013 -0500 ---------------------------------------------------------------------- NEWS.txt | 4 ++++ conf/cassandra.yaml | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/03a1fb10/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/03a1fb10/conf/cassandra.yaml ----------------------------------------------------------------------
