Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e36ae521 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e36ae521 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e36ae521 Branch: refs/heads/trunk Commit: e36ae521b2861a8834266b1871736e2e62563c2a Parents: 4ed316e 321f5e8 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Fri May 22 17:41:18 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Fri May 22 17:41:18 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/formatting.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e36ae521/CHANGES.txt ----------------------------------------------------------------------
