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/9635c604 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9635c604 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9635c604 Branch: refs/heads/trunk Commit: 9635c6041a1b70dbefc6ca2b5b58b08717077300 Parents: 735f1a4 b8c12fb Author: Stefan Podkowinski <stefan.podkowin...@1und1.de> Authored: Mon Jan 22 14:26:23 2018 +0100 Committer: Stefan Podkowinski <stefan.podkowin...@1und1.de> Committed: Mon Jan 22 14:27:31 2018 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + redhat/cassandra.spec | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9635c604/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fd0acb9,81b358d..b34cb1b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -222,7 -45,8 +222,8 @@@ Merged from 2.2 * Rely on the JVM to handle OutOfMemoryErrors (CASSANDRA-13006) * Grab refs during scrub/index redistribution/cleanup (CASSANDRA-13873) Merged from 2.1: + * RPM package spec: fix permissions for installed jars and config files (CASSANDRA-14181) - * 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/9635c604/redhat/cassandra.spec ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
