Merge branch 'cassandra-2.2' into cassandra-3.0

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fd6c545
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fd6c545
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fd6c545

Branch: refs/heads/trunk
Commit: 5fd6c545e5e95b2e2a90b06d95177c57efb6f05b
Parents: 9b3b3ca cd75ecd
Author: Tyler Hobbs <tylerlho...@gmail.com>
Authored: Wed Nov 25 17:53:15 2015 -0600
Committer: Tyler Hobbs <tylerlho...@gmail.com>
Committed: Wed Nov 25 17:53:15 2015 -0600

----------------------------------------------------------------------
 pylib/cqlshlib/formatting.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


Reply via email to