You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2016/09/04 05:17:30 UTC
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca7256d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca7256d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca7256d7
Branch: refs/heads/trunk
Commit: ca7256d765b8d80ee538bc16877ef62c5769898e
Parents: ccc8489 fa14804
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun Sep 4 01:17:12 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Sep 4 01:17:12 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/JsonTransformer.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca7256d7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2f8ee61,21fc42c..83060fb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -146,14 -47,13 +146,15 @@@ Merged from 3.0
those static columns in query results (CASSANDRA-12123)
* Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
* Fix EOF exception when altering column type (CASSANDRA-11820)
+ * Fix potential race in schema during new table creation (CASSANDRA-12083)
+ * cqlsh: fix error handling in rare COPY FROM failure scenario (CASSANDRA-12070)
+ * Disable autocompaction during drain (CASSANDRA-11878)
+ * Add a metrics timer to MemtablePool and use it to track time spent blocked on memory in MemtableAllocator (CASSANDRA-11327)
+ * Fix upgrading schema with super columns with non-text subcomparators (CASSANDRA-12023)
+ * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
+ * Fix JsonTransformer output of partition with deletion info (CASSANDRA-12418)
Merged from 2.2:
* Add local address entry in PropertyFileSnitch (CASSANDRA-11332)
- * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
- * Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523)
- * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522)
- * Fail repair on non-existing table (CASSANDRA-12279)
* cqlsh copy: fix missing counter values (CASSANDRA-12476)
* Move migration tasks to non-periodic queue, assure flush executor shutdown after non-periodic executor (CASSANDRA-12251)
* cqlsh copy: fixed possible race in initializing feeding thread (CASSANDRA-11701)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca7256d7/src/java/org/apache/cassandra/tools/JsonTransformer.java
----------------------------------------------------------------------