Merge branch 'cassandra-1.2' into trunk
Conflicts:
bin/cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ccc87fb3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccc87fb3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ccc87fb3
Branch: refs/heads/trunk
Commit: ccc87fb30f9435d2d3aebf8658ab355c3f0c3257
Parents: 9e8691c 46273c4
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Tue Jun 4 01:00:14 2013 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Tue Jun 4 01:00:14 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccc87fb3/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccc87fb3/bin/cqlsh
----------------------------------------------------------------------
