Updated Branches: refs/heads/trunk 120bf9f14 -> ace2258eb
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/ace2258e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ace2258e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ace2258e Branch: refs/heads/trunk Commit: ace2258eb86436009bc61f9d4e7277d7481d2573 Parents: 120bf9f 7532d5c Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Dec 17 19:50:03 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Dec 17 19:50:03 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ace2258e/CHANGES.txt ----------------------------------------------------------------------
