Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
pylib/cqlshlib/formatting.py
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cdf2b3f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cdf2b3f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cdf2b3f
Branch: refs/heads/trunk
Commit: 0cdf2b3fc5bc9a07699e99d21f73f911343ede8e
Parents: 6858dd3 37736ab
Author: Mikhail Stepura <mish...@apache.org>
Authored: Fri Jun 20 14:04:29 2014 +1100
Committer: Mikhail Stepura <mish...@apache.org>
Committed: Fri Jun 20 14:04:29 2014 +1100
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cdf2b3f/CHANGES.txt
----------------------------------------------------------------------
