Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d324f9d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d324f9d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d324f9d Branch: refs/heads/trunk Commit: 6d324f9d769f24ac209f6ea7649fee02b0200ba0 Parents: 1e58a53 02bbdd6 Author: Jason Brown <jasedbr...@gmail.com> Authored: Mon Jan 15 06:05:35 2018 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Mon Jan 15 06:06:51 2018 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ bin/cqlsh.py | 8 ++++++-- pylib/cqlshlib/copyutil.py | 8 ++++---- pylib/cqlshlib/cql3handling.py | 18 ++++++++++++++++++ pylib/cqlshlib/displaying.py | 1 + pylib/cqlshlib/formatting.py | 18 ++++++++++++++++++ pylib/cqlshlib/pylexotron.py | 1 + pylib/cqlshlib/wcwidth.py | 3 +++ 8 files changed, 53 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d324f9d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e38cd70,ebb7a66..0cda459 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -218,6 -42,8 +218,8 @@@ Merged from 2.2 * Fix race that prevents submitting compaction for a table when executor is full (CASSANDRA-13801) * Rely on the JVM to handle OutOfMemoryErrors (CASSANDRA-13006) * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873) + Merged from 2.1: - * More PEP8 compiance for cqlsh (CASSANDRA-14021) ++ * More PEP8 compliance for cqlsh 3.11.1 http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d324f9d/bin/cqlsh.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d324f9d/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
