cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3
Date Tue, 19 Jan 2016 08:11:11 GMT
Merge branch 'cassandra-3.0' into cassandra-3.3


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

Branch: refs/heads/trunk
Commit: 289ad7713fda90c295aaf0ee86c41d5e64c73dcf
Parents: bf917cb 8517635
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Tue Jan 19 09:06:19 2016 +0100
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Tue Jan 19 09:06:19 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                             | 1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/289ad771/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 840c795,165e5d1..2c19a1b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -21,7 -29,16 +21,8 @@@ Merged from 2.2
   * Optimize pending range computation (CASSANDRA-9258)
   * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
   * drop/alter user should be case sensitive (CASSANDRA-10817)
 - * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 - * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 - * Add new types to Stress (CASSANDRA-9556)
 - * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 - * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
  Merged from 2.1:
+  * Unmark sstables compacting once they are done in cleanup/scrub/upgradesstables (CASSANDRA-10829)
   * Allow simultaneous bootstrapping with strict consistency when no vnodes are used (CASSANDRA-11005)
   * Log a message when major compaction does not result in a single file (CASSANDRA-10847)
   * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/289ad771/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------


Mime
View raw message