Updated Branches: refs/heads/cassandra-1.1 1e7604462 -> 962b23ba0 refs/heads/trunk d569f873d -> e117cbe2b
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/e117cbe2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e117cbe2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e117cbe2 Branch: refs/heads/trunk Commit: e117cbe2b23e82fa193ada10950931bb8ab48b42 Parents: d569f87 962b23b Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Jul 12 12:41:41 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Jul 12 12:41:41 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + tools/bin/token-generator | 317 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 318 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e117cbe2/CHANGES.txt ----------------------------------------------------------------------
