cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [09/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Mon, 06 Jul 2015 14:17:15 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
	src/java/org/apache/cassandra/transport/Client.java


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

Branch: refs/heads/trunk
Commit: 63e122c2c2be7aed15519600a162720c3a22e8ae
Parents: fe07092 ca2f022
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Mon Jul 6 15:09:30 2015 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Mon Jul 6 15:09:30 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 .../org/apache/cassandra/transport/messages/AuthSuccess.java | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/63e122c2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a160b09,69cb32c..9973bbc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -27,13 -6,12 +27,14 @@@ Merged from 2.1
   * Update internal python driver for cqlsh (CASSANDRA-9064)
   * Fix IndexOutOfBoundsException when inserting tuple with too many
     elements using the string literal notation (CASSANDRA-9559)
 - * 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)
 + * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
   * ColumnFamilyStore.selectAndReference may block during compaction (CASSANDRA-9637)
 + * Fix bug in cardinality check when compacting (CASSANDRA-9580)
 + * Fix memory leak in Ref due to ConcurrentLinkedQueue.remove() behaviour (CASSANDRA-9549)
 + * Make rebuild only run one at a time (CASSANDRA-9119)
  Merged from 2.0:
+  * Avoid NPE in AuthSuccess#decode (CASSANDRA-9727)
   * Add listen_address to system.local (CASSANDRA-9603)
   * Bug fixes to resultset metadata construction (CASSANDRA-9636)
   * Fix setting 'durable_writes' in ALTER KEYSPACE (CASSANDRA-9560)


Mime
View raw message