Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
bin/cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a277eabe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a277eabe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a277eabe
Branch: refs/heads/cassandra-2.1
Commit: a277eabe17998309b62adde07eaaddc0ee4c0c6a
Parents: 3aef07d 6faf80c
Author: Aleksey Yeschenko <[email protected]>
Authored: Sun May 25 18:16:32 2014 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Sun May 25 18:16:32 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
