cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [1/3] cassandra git commit: fix CHANGES.txt
Date Fri, 26 Jun 2015 06:34:13 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 60e8d2bf0 -> 4d4b33a59


fix CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 1119983575c0414471088195534456a7e0909815
Parents: 5d9729b
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Fri Jun 26 08:30:02 2015 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Fri Jun 26 08:30:02 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/11199835/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 70efc81..7f4ca28 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,12 +1,16 @@
-2.1.7
+2.1.8
  * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
  * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
  * Enable describe on indices (CASSANDRA-7814)
  * ColumnFamilyStore.selectAndReference may block during compaction (CASSANDRA-9637)
+Merged from 2.0
+  * 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565)
+
+
+2.1.7
  * Fix bug in cardinality check when compacting (CASSANDRA-9580)
  * Fix memory leak in Ref due to ConcurrentLinkedQueue.remove() behaviour (CASSANDRA-9549)
 Merged from 2.0
- * 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565)
  * Expose some internals of SelectStatement for inspection (CASSANDRA-9532)
  * ArrivalWindow should use primitives (CASSANDRA-9496)
  * Periodically submit background compaction tasks (CASSANDRA-9592)


Mime
View raw message