Merge branch 'cassandra-2.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/5d3c2c98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d3c2c98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d3c2c98

Branch: refs/heads/trunk
Commit: 5d3c2c985287ad2f2f899a84ccdcb2d3ce963854
Parents: 0c3720a 8092d2c
Author: Tyler Hobbs <tylerho...@apache.org>
Authored: Wed Jan 21 18:37:21 2015 -0600
Committer: Tyler Hobbs <tylerho...@apache.org>
Committed: Wed Jan 21 18:37:21 2015 -0600

----------------------------------------------------------------------
 pylib/cqlshlib/formatting.py | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


Reply via email to