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/069e383f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/069e383f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/069e383f

Branch: refs/heads/trunk
Commit: 069e383f57e3106bbe2e6ddcebeae77da1ea53e1
Parents: 7b38b7e b92d90d
Author: Jay Zhuang <[email protected]>
Authored: Wed May 30 22:01:21 2018 -0700
Committer: Jay Zhuang <[email protected]>
Committed: Wed May 30 22:02:21 2018 -0700

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 build.xml   | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/069e383f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 111f644,2d4ef25..b94fc62
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -260,7 -16,9 +260,8 @@@
   * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
   * Fix wildcard GROUP BY queries (CASSANDRA-14209)
  Merged from 3.0:
+  * Add Missing dependencies in pom-all (CASSANDRA-14422)
   * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
 - * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
   * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
   * Fix progress stats and units in compactionstats (CASSANDRA-12244)
   * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/069e383f/build.xml
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to