Updated Branches: refs/heads/cassandra-1.2 75d0f7a3f -> 295d6af46 refs/heads/trunk d216b0d28 -> 7590b0267
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/7590b026 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7590b026 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7590b026 Branch: refs/heads/trunk Commit: 7590b0267714456b29b8f0de50dddf9be96f0bcb Parents: baca0bc 295d6af Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Feb 5 15:45:55 2013 +0100 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Feb 5 15:45:55 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7590b026/CHANGES.txt ----------------------------------------------------------------------