Updated Branches: refs/heads/cassandra-1.0 c9f88103d -> 40515ed5d refs/heads/cassandra-1.1 63f6c8431 -> 6e10da082 refs/heads/cassandra-1.1.0 2b77ef61c -> 2ca983d9c refs/heads/trunk 374f511eb -> d76458e4a
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/d76458e4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d76458e4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d76458e4 Branch: refs/heads/trunk Commit: d76458e4abfeaea9da91cf1d5bc2681d856a427a Parents: 374f511 6e10da0 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Apr 5 15:11:44 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Apr 5 15:11:44 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d76458e4/CHANGES.txt ----------------------------------------------------------------------
