[2/3] cassandra git commit: Fix up CHANGES.txt

2017-09-30 Thread aleksey 
Fix up CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 9d56132ae8dfd2a31d8bf94bd60bac550bbfc522
Parents: e819fec
Author: Aleksey Yeschenko 
Authored: Sat Sep 30 11:10:08 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Sat Sep 30 11:25:22 2017 +0100

--
 CHANGES.txt | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d56132a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 61f3405..264887b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@
  * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
  * BTree.Builder memory leak (CASSANDRA-13754)
  * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
+ * Add a skip read validation flag to cassandra-stress (CASSANDRA-13772)
  * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
  * Better bootstrap failure message when blocked by (potential) range movement 
(CASSANDRA-13744)
  * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
@@ -17,6 +18,7 @@ Merged from 3.0:
  * AssertionError prepending to a list (CASSANDRA-13149)
  * Fix support for SuperColumn tables (CASSANDRA-12373)
  * Handle limit correctly on tables with strict liveness (CASSANDRA-13883)
+ * Fix missing original update in TriggerExecutor (CASSANDRA-13894)
  * Remove non-rpc-ready nodes from counter leader candidates (CASSANDRA-13043)
  * Improve short read protection performance (CASSANDRA-13794)
  * Fix sstable reader to support range-tombstone-marker for multi-slices 
(CASSANDRA-13787)
@@ -59,6 +61,7 @@ Merged from 3.0:
  * Make concat work with iterators that have different subsets of columns 
(CASSANDRA-13482)
  * Set test.runners based on cores and memory size (CASSANDRA-13078)
  * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
+ * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
  * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
  * Nodetool listsnapshots output is missing a newline, if there are no 
snapshots (CASSANDRA-13568)
  * sstabledump reports incorrect usage for argument order (CASSANDRA-13532)
@@ -179,11 +182,7 @@ Merged from 3.0:
  * Provide user workaround when system_schema.columns does not contain entries
for a table that's in system_schema.tables (CASSANDRA-13180)
  * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
-<<< HEAD
  * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
-===
- * Fix NPE issue in StorageService (CASSANDRA-13060)
->>> cassandra-3.0
 Merged from 2.2:
  * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
  * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[1/3] cassandra git commit: Fix up CHANGES.txt

2017-09-30 Thread aleksey 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 e819fec89 -> 9d56132ae
  refs/heads/trunk 0db88242c -> 6afe13f6f


Fix up CHANGES.txt


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

Branch: refs/heads/cassandra-3.11
Commit: 9d56132ae8dfd2a31d8bf94bd60bac550bbfc522
Parents: e819fec
Author: Aleksey Yeschenko 
Authored: Sat Sep 30 11:10:08 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Sat Sep 30 11:25:22 2017 +0100

--
 CHANGES.txt | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d56132a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 61f3405..264887b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@
  * Add a compaction option to TWCS to ignore sstables overlapping checks 
(CASSANDRA-13418)
  * BTree.Builder memory leak (CASSANDRA-13754)
  * Revert CASSANDRA-10368 of supporting non-pk column filtering due to 
correctness (CASSANDRA-13798)
+ * Add a skip read validation flag to cassandra-stress (CASSANDRA-13772)
  * Fix cassandra-stress hang issues when an error during cluster connection 
happens (CASSANDRA-12938)
  * Better bootstrap failure message when blocked by (potential) range movement 
(CASSANDRA-13744)
  * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
@@ -17,6 +18,7 @@ Merged from 3.0:
  * AssertionError prepending to a list (CASSANDRA-13149)
  * Fix support for SuperColumn tables (CASSANDRA-12373)
  * Handle limit correctly on tables with strict liveness (CASSANDRA-13883)
+ * Fix missing original update in TriggerExecutor (CASSANDRA-13894)
  * Remove non-rpc-ready nodes from counter leader candidates (CASSANDRA-13043)
  * Improve short read protection performance (CASSANDRA-13794)
  * Fix sstable reader to support range-tombstone-marker for multi-slices 
(CASSANDRA-13787)
@@ -59,6 +61,7 @@ Merged from 3.0:
  * Make concat work with iterators that have different subsets of columns 
(CASSANDRA-13482)
  * Set test.runners based on cores and memory size (CASSANDRA-13078)
  * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
+ * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
  * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
  * Nodetool listsnapshots output is missing a newline, if there are no 
snapshots (CASSANDRA-13568)
  * sstabledump reports incorrect usage for argument order (CASSANDRA-13532)
@@ -179,11 +182,7 @@ Merged from 3.0:
  * Provide user workaround when system_schema.columns does not contain entries
for a table that's in system_schema.tables (CASSANDRA-13180)
  * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
-<<< HEAD
  * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
-===
- * Fix NPE issue in StorageService (CASSANDRA-13060)
->>> cassandra-3.0
 Merged from 2.2:
  * Nodes started with join_ring=False should be able to serve requests when 
authentication is enabled (CASSANDRA-11381)
  * cqlsh COPY FROM: increment error count only for failures, not for attempts 
(CASSANDRA-13209)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[3/5] cassandra git commit: Fix up CHANGES.txt

2017-09-30 Thread aleksey 
Fix up CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 15cee48bbabdd75a58df32940d1143c9056e6792
Parents: 68a6746
Author: Aleksey Yeschenko 
Authored: Sat Sep 30 10:44:47 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Sat Sep 30 10:44:47 2017 +0100

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15cee48b/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index c5e54d4..4a45469 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,6 +19,7 @@
  * Fix pending view mutations handling and cleanup batchlog when there are 
local and remote paired mutations (CASSANDRA-13069)
  * Improve config validation and documentation on overflow and NPE 
(CASSANDRA-13622)
  * Range deletes in a CAS batch are ignored (CASSANDRA-13655)
+ * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014)
  * Change repair midpoint logging for tiny ranges (CASSANDRA-13603)
  * Better handle corrupt final commitlog segment (CASSANDRA-11995)
  * StreamingHistogram is not thread safe (CASSANDRA-13756)
@@ -117,7 +118,6 @@ Merged from 2.2:
  * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
  * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
  * Fix NPE issue in StorageService (CASSANDRA-13060)
- * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014)
 Merged from 2.2:
  * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
  * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[3/4] cassandra git commit: Fix up CHANGES.txt

2017-09-30 Thread aleksey 
Fix up CHANGES.txt


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

Branch: refs/heads/cassandra-3.11
Commit: 15cee48bbabdd75a58df32940d1143c9056e6792
Parents: 68a6746
Author: Aleksey Yeschenko 
Authored: Sat Sep 30 10:44:47 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Sat Sep 30 10:44:47 2017 +0100

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15cee48b/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index c5e54d4..4a45469 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,6 +19,7 @@
  * Fix pending view mutations handling and cleanup batchlog when there are 
local and remote paired mutations (CASSANDRA-13069)
  * Improve config validation and documentation on overflow and NPE 
(CASSANDRA-13622)
  * Range deletes in a CAS batch are ignored (CASSANDRA-13655)
+ * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014)
  * Change repair midpoint logging for tiny ranges (CASSANDRA-13603)
  * Better handle corrupt final commitlog segment (CASSANDRA-11995)
  * StreamingHistogram is not thread safe (CASSANDRA-13756)
@@ -117,7 +118,6 @@ Merged from 2.2:
  * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
  * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
  * Fix NPE issue in StorageService (CASSANDRA-13060)
- * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014)
 Merged from 2.2:
  * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
  * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

cassandra git commit: Fix up CHANGES.txt

2017-09-30 Thread aleksey 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 68a67469f -> 15cee48bb


Fix up CHANGES.txt


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

Branch: refs/heads/cassandra-3.0
Commit: 15cee48bbabdd75a58df32940d1143c9056e6792
Parents: 68a6746
Author: Aleksey Yeschenko 
Authored: Sat Sep 30 10:44:47 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Sat Sep 30 10:44:47 2017 +0100

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15cee48b/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index c5e54d4..4a45469 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -19,6 +19,7 @@
  * Fix pending view mutations handling and cleanup batchlog when there are 
local and remote paired mutations (CASSANDRA-13069)
  * Improve config validation and documentation on overflow and NPE 
(CASSANDRA-13622)
  * Range deletes in a CAS batch are ignored (CASSANDRA-13655)
+ * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014)
  * Change repair midpoint logging for tiny ranges (CASSANDRA-13603)
  * Better handle corrupt final commitlog segment (CASSANDRA-11995)
  * StreamingHistogram is not thread safe (CASSANDRA-13756)
@@ -117,7 +118,6 @@ Merged from 2.2:
  * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
  * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
  * Fix NPE issue in StorageService (CASSANDRA-13060)
- * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014)
 Merged from 2.2:
  * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
  * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[2/3] cassandra git commit: Fix up CHANGES.txt

2016-08-30 Thread aleksey 
Fix up CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 6facdf0be686db3c50e8177c7ed16f5692e81b0d
Parents: 2ca8f38
Author: Aleksey Yeschenko 
Authored: Tue Aug 30 16:27:30 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Aug 30 16:27:30 2016 +0100

--
 CHANGES.txt | 32 +++-
 1 file changed, 11 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6facdf0b/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 51aa1d0..5a73dd8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-3.9
+3.8, 3.9
  * Fix value skipping with counter columns (CASSANDRA-11726)
  * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
  * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
@@ -68,6 +68,12 @@ 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)
 Merged from 2.2:
  * 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)
@@ -86,32 +92,16 @@ Merged from 2.2:
  * Use dedicated thread for JMX notifications (CASSANDRA-12146)
  * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
  * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
-Merged from 2.1:
- * Fix queries with empty ByteBuffer values in clustering column restrictions 
(CASSANDRA-12127)
- * Disable passing control to post-flush after flush failure to prevent data 
loss (CASSANDRA-11828)
- * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
- * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
- * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
-
-
-3.0.8
- * 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)
-Merged from 2.2:
- * Synchronize ThriftServer::stop() (CASSANDRA-12105)
- * Use dedicated thread for JMX notifications (CASSANDRA-12146)
- * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
- * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
  * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755)
  * Validate bloom_filter_fp_chance against lowest supported
value when the table is created (CASSANDRA-11920)
  * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038)
  * StorageService shutdown hook should use a volatile variable 
(CASSANDRA-11984)
 Merged from 2.1:
+ * Fix queries with empty ByteBuffer values in clustering column restrictions 
(CASSANDRA-12127)
+ * Disable passing control to post-flush after flush failure to prevent data 
loss (CASSANDRA-11828)
+ * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
+ * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
  * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
  * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
  * Remove finished incoming streaming connections from MessagingService 
(CASSANDRA-11854)

[1/3] cassandra git commit: Fix up CHANGES.txt

2016-08-30 Thread aleksey 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.9 2ca8f38ef -> 6facdf0be
  refs/heads/trunk 102541e12 -> f629808d6


Fix up CHANGES.txt


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

Branch: refs/heads/cassandra-3.9
Commit: 6facdf0be686db3c50e8177c7ed16f5692e81b0d
Parents: 2ca8f38
Author: Aleksey Yeschenko 
Authored: Tue Aug 30 16:27:30 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Aug 30 16:27:30 2016 +0100

--
 CHANGES.txt | 32 +++-
 1 file changed, 11 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6facdf0b/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 51aa1d0..5a73dd8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-3.9
+3.8, 3.9
  * Fix value skipping with counter columns (CASSANDRA-11726)
  * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
  * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
@@ -68,6 +68,12 @@ 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)
 Merged from 2.2:
  * 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)
@@ -86,32 +92,16 @@ Merged from 2.2:
  * Use dedicated thread for JMX notifications (CASSANDRA-12146)
  * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
  * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
-Merged from 2.1:
- * Fix queries with empty ByteBuffer values in clustering column restrictions 
(CASSANDRA-12127)
- * Disable passing control to post-flush after flush failure to prevent data 
loss (CASSANDRA-11828)
- * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
- * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
- * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
-
-
-3.0.8
- * 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)
-Merged from 2.2:
- * Synchronize ThriftServer::stop() (CASSANDRA-12105)
- * Use dedicated thread for JMX notifications (CASSANDRA-12146)
- * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
- * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
  * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755)
  * Validate bloom_filter_fp_chance against lowest supported
value when the table is created (CASSANDRA-11920)
  * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038)
  * StorageService shutdown hook should use a volatile variable 
(CASSANDRA-11984)
 Merged from 2.1:
+ * Fix queries with empty ByteBuffer values in clustering column restrictions 
(CASSANDRA-12127)
+ * Disable passing control to post-flush after flush failure to prevent data 
loss (CASSANDRA-11828)
+ * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
+ * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
  * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
  * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
  * Remove finished incoming streaming connections from MessagingService 
(CASSANDRA-11854)

cassandra git commit: Fix up CHANGES.txt

2015-05-20 Thread aleksey 
Repository: cassandra
Updated Branches:
  refs/heads/trunk 418aefdd2 - 2fd755970


Fix up CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 2fd7559703f64d66cdbb9ee7e3e39726ce2970c6
Parents: 418aefd
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed May 20 20:06:34 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed May 20 20:06:34 2015 +0300

--
 CHANGES.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fd75597/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 4ee25ab..d480db7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,12 @@
 3.0:
  * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
  * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
- * Add ability to stop compaction by ID (CASSANDRA-7207)
+
 
 2.2
  * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409)
  * Revert CASSANDRA-7807 (tracing completion client notifications) 
(CASSANDRA-9429)
+ * Add ability to stop compaction by ID (CASSANDRA-7207)
 Merged from 2.1:
 2.1.6
  * Optimize range tombstone memory footprint (CASSANDRA-8603)