Merge branch 'cassandra-3.0' into cassandra-3.1

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

Branch: refs/heads/trunk
Commit: 138f8db85b85ce2061894b42e4f6652c237bc4de
Parents: c1b1aec 5fd6c54
Author: Tyler Hobbs <tylerlho...@gmail.com>
Authored: Wed Nov 25 17:53:34 2015 -0600
Committer: Tyler Hobbs <tylerlho...@gmail.com>
Committed: Wed Nov 25 17:53:34 2015 -0600

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


Reply via email to