Updated Branches: refs/heads/trunk ace2258eb -> 02c8e233b
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/02c8e233 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02c8e233 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02c8e233 Branch: refs/heads/trunk Commit: 02c8e233b6a1ee9593f76a8b94e8f27957818b7a Parents: ace2258 63c5a9e Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Dec 18 18:20:36 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Dec 18 18:20:36 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra-shuffle | 57 +++++++++++++++++++++++++++++++++++++++++ bin/shuffle | 57 ----------------------------------------- debian/cassandra.install | 1 + 4 files changed, 59 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/02c8e233/CHANGES.txt ----------------------------------------------------------------------
