Updated Branches: refs/heads/cassandra-1.1 0307dca20 -> b961986a7 refs/heads/trunk 356e8ab5e -> f177d8e59
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/f177d8e5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f177d8e5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f177d8e5 Branch: refs/heads/trunk Commit: f177d8e59ac66f1aa247eb40c385e42d3cf6f830 Parents: 356e8ab b961986 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Sep 24 15:36:44 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Sep 24 15:36:44 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f177d8e5/CHANGES.txt ----------------------------------------------------------------------
