Updated Branches: refs/heads/cassandra-1.1 7db46ef80 -> 5655d9722 refs/heads/trunk 413a177df -> dafcaeb06
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/dafcaeb0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dafcaeb0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dafcaeb0 Branch: refs/heads/trunk Commit: dafcaeb06103eb6e86ada1798ef6ce5cc4e87dac Parents: 413a177 5655d97 Author: Jonathan Ellis <[email protected]> Authored: Tue Aug 21 11:27:47 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Aug 21 11:27:47 2012 -0500 ---------------------------------------------------------------------- NEWS.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dafcaeb0/NEWS.txt ----------------------------------------------------------------------
