[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[aleksey]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: f629808d6fbe89f44227a2cb3a8314b5ea589c10
Parents: 102541e 6facdf0
Author: Aleksey Yeschenko 
Authored: Tue Aug 30 16:28:39 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Aug 30 16:28:39 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f629808d/CHANGES.txt
--
diff --cc CHANGES.txt
index 77d32be,5a73dd8..2135173
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,71 -1,4 +1,71 @@@
 +3.10
 + * Tracing payload is passed through newSession(..) (CASSANDRA-11706)
 + * avoid deleting non existing sstable files and improve related log messages 
(CASSANDRA-12261)
 + * json/yaml output format for nodetool compactionhistory (CASSANDRA-12486)
 + * Retry all internode messages once after a connection is
 +   closed and reopened (CASSANDRA-12192)
 + * Add support to rebuild from targeted replica (CASSANDRA-9875)
 + * Add sequence distribution type to cassandra stress (CASSANDRA-12490)
 + * "SELECT * FROM foo LIMIT ;" does not error out (CASSANDRA-12154)
 + * Define executeLocally() at the ReadQuery Level (CASSANDRA-12474)
 + * Extend read/write failure messages with a map of replica addresses
 +   to error codes in the v5 native protocol (CASSANDRA-12311)
 + * Fix rebuild of SASI indexes with existing index files (CASSANDRA-12374)
 + * Let DatabaseDescriptor not implicitly startup services (CASSANDRA-9054, 
12550)
 + * Fix clustering indexes in presence of static columns in SASI 
(CASSANDRA-12378)
 + * Fix queries on columns with reversed type on SASI indexes (CASSANDRA-12223)
 + * Added slow query log (CASSANDRA-12403)
 + * Count full coordinated request against timeout (CASSANDRA-12256)
 + * Allow TTL with null value on insert and update (CASSANDRA-12216)
 + * Make decommission operation resumable (CASSANDRA-12008)
 + * Add support to one-way targeted repair (CASSANDRA-9876)
 + * Remove clientutil jar (CASSANDRA-11635)
 + * Fix compaction throughput throttle (CASSANDRA-12366)
 + * Delay releasing Memtable memory on flush until PostFlush has finished 
running (CASSANDRA-12358)
 + * Cassandra stress should dump all setting on startup (CASSANDRA-11914)
 + * Make it possible to compact a given token range (CASSANDRA-10643)
 + * Allow updating DynamicEndpointSnitch properties via JMX (CASSANDRA-12179)
 + * Collect metrics on queries by consistency level (CASSANDRA-7384)
 + * Add support for GROUP BY to SELECT statement (CASSANDRA-10707)
 + * Deprecate memtable_cleanup_threshold and update default for 
memtable_flush_writers (CASSANDRA-12228)
 + * Upgrade to OHC 0.4.4 (CASSANDRA-12133)
 + * Add version command to cassandra-stress (CASSANDRA-12258)
 + * Create compaction-stress tool (CASSANDRA-11844)
 + * Garbage-collecting compaction operation and schema option (CASSANDRA-7019)
 + * Add beta protocol flag for v5 native protocol (CASSANDRA-12142)
 + * Support filtering on non-PRIMARY KEY columns in the CREATE
 +   MATERIALIZED VIEW statement's WHERE clause (CASSANDRA-10368)
 + * Unify STDOUT and SYSTEMLOG logback format (CASSANDRA-12004)
 + * COPY FROM should raise error for non-existing input files (CASSANDRA-12174)
 + * Faster write path (CASSANDRA-12269)
 + * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424)
 + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
 + * Expose metrics for successful/failed authentication attempts 
(CASSANDRA-10635)
 + * Prepend snapshot name with "truncated" or "dropped" when a snapshot
 +   is taken before truncating or dropping a table (CASSANDRA-12178)
 + * Optimize RestrictionSet (CASSANDRA-12153)
 + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
 + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
 + * Create a system table to expose prepared statements (CASSANDRA-8831)
 + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
 + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
 + * Add supplied username to authentication error messages (CASSANDRA-12076)
 + * Remove pre-startup check for open JMX port (CASSANDRA-12074)
 + * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
 + * Restore resumable hints delivery (CASSANDRA-11960)
 +Merged from 3.0:
 + * Fix file system race condition that may cause LogAwareFileLister to fail 
to classify files 

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[aleksey]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: 7c60840e945823b8ad9aecfd68b290a32301b7e6
Parents: 2c4b301 ee60941
Author: Aleksey Yeschenko 
Authored: Tue Aug 9 16:36:28 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Aug 9 16:36:28 2016 +0100

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/db/Conflicts.java |  9 +++
 .../cql3/validation/entities/CountersTest.java  | 27 
 3 files changed, 37 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c60840e/CHANGES.txt
--
diff --cc CHANGES.txt
index 097e9c1,b7bbf72..5161045
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,39 -1,5 +1,40 @@@
 +3.10
 + * Cassandra stress should dump all setting on startup (CASSANDRA-11914)
 + * Make it possible to compact a given token range (CASSANDRA-10643)
 + * Allow updating DynamicEndpointSnitch properties via JMX (CASSANDRA-12179)
 + * Collect metrics on queries by consistency level (CASSANDRA-7384)
 + * Add support for GROUP BY to SELECT statement (CASSANDRA-10707)
 + * Deprecate memtable_cleanup_threshold and update default for 
memtable_flush_writers (CASSANDRA-12228)
 + * Upgrade to OHC 0.4.4 (CASSANDRA-12133)
 + * Add version command to cassandra-stress (CASSANDRA-12258)
 + * Create compaction-stress tool (CASSANDRA-11844)
 + * Garbage-collecting compaction operation and schema option (CASSANDRA-7019)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Add beta protocol flag for v5 native protocol (CASSANDRA-12142)
 + * Support filtering on non-PRIMARY KEY columns in the CREATE
 +   MATERIALIZED VIEW statement's WHERE clause (CASSANDRA-10368)
 + * Unify STDOUT and SYSTEMLOG logback format (CASSANDRA-12004)
 + * COPY FROM should raise error for non-existing input files (CASSANDRA-12174)
 + * Faster write path (CASSANDRA-12269)
 + * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424)
 + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
 + * Expose metrics for successful/failed authentication attempts 
(CASSANDRA-10635)
 + * Prepend snapshot name with "truncated" or "dropped" when a snapshot
 +   is taken before truncating or dropping a table (CASSANDRA-12178)
 + * Optimize RestrictionSet (CASSANDRA-12153)
 + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
 + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
 + * Create a system table to expose prepared statements (CASSANDRA-8831)
 + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
 + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
 + * Add supplied username to authentication error messages (CASSANDRA-12076)
 + * Remove pre-startup check for open JMX port (CASSANDRA-12074)
 + * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
 +
 +
  3.9
+  * Fix value skipping with counter columns (CASSANDRA-11726)
 + * Restore resumable hints delivery (CASSANDRA-11960)
   * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
   * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
   * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c60840e/test/unit/org/apache/cassandra/cql3/validation/entities/CountersTest.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[aleksey]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: e9132b29aa697c84f6030432a3530bed405246e0
Parents: 938faa2 ae816cb
Author: Aleksey Yeschenko 
Authored: Mon Aug 8 18:38:27 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Aug 8 18:38:27 2016 +0100

--
 .../org/apache/cassandra/db/LegacyLayout.java   | 23 
 1 file changed, 19 insertions(+), 4 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[stefania]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: b5dfa30969880391b9acec7c35d357537471da39
Parents: a5d095e 5e319bb
Author: Stefania Alborghetti 
Authored: Fri Aug 5 15:28:42 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Aug 5 15:28:42 2016 +0800

--

--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[yukim]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: c49bc639f46131baca3ceda74170a97cfca3105c
Parents: 3472cf0 c9df18c
Author: Yuki Morishita 
Authored: Thu Aug 4 21:01:50 2016 -0500
Committer: Yuki Morishita 
Committed: Thu Aug 4 21:01:50 2016 -0500

--
 CHANGES.txt | 1 +
 .../apache/cassandra/tools/nodetool/stats/TableStatsPrinter.java| 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c49bc639/CHANGES.txt
--
diff --cc CHANGES.txt
index c7063d9,bcfbdc9..db2e221
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,5 +1,37 @@@
 +3.10
 + * Allow updating DynamicEndpointSnitch properties via JMX (CASSANDRA-12179)
 + * Collect metrics on queries by consistency level (CASSANDRA-7384)
 + * Add support for GROUP BY to SELECT statement (CASSANDRA-10707)
 + * Deprecate memtable_cleanup_threshold and update default for 
memtable_flush_writers (CASSANDRA-12228)
 + * Upgrade to OHC 0.4.4 (CASSANDRA-12133)
 + * Add version command to cassandra-stress (CASSANDRA-12258)
 + * Create compaction-stress tool (CASSANDRA-11844)
 + * Garbage-collecting compaction operation and schema option (CASSANDRA-7019)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Add beta protocol flag for v5 native protocol (CASSANDRA-12142)
 + * Support filtering on non-PRIMARY KEY columns in the CREATE
 +   MATERIALIZED VIEW statement's WHERE clause (CASSANDRA-10368)
 + * Unify STDOUT and SYSTEMLOG logback format (CASSANDRA-12004)
 + * COPY FROM should raise error for non-existing input files (CASSANDRA-12174)
 + * Faster write path (CASSANDRA-12269)
 + * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424)
 + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
 + * Expose metrics for successful/failed authentication attempts 
(CASSANDRA-10635)
 + * Prepend snapshot name with "truncated" or "dropped" when a snapshot
 +   is taken before truncating or dropping a table (CASSANDRA-12178)
 + * Optimize RestrictionSet (CASSANDRA-12153)
 + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
 + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
 + * Create a system table to expose prepared statements (CASSANDRA-8831)
 + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
 + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
 + * Add supplied username to authentication error messages (CASSANDRA-12076)
 + * Remove pre-startup check for open JMX port (CASSANDRA-12074)
 + * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
 +
 +
  3.9
+  * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
   * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
   * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
   * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c49bc639/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsPrinter.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[stefania]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: b637fee8986a5b47d236609959425aa4f0531d16
Parents: c320f22 f5078b1
Author: Stefania Alborghetti 
Authored: Tue Aug 2 15:53:32 2016 +0800
Committer: Stefania Alborghetti 
Committed: Tue Aug 2 15:53:32 2016 +0800

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/cql3/CQLTester.java| 39 
 .../miscellaneous/SSTablesIteratedTest.java | 25 +++--
 3 files changed, 53 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b637fee8/CHANGES.txt
--
diff --cc CHANGES.txt
index 1f5ad3a,5647cd4..3de3653
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,5 +1,32 @@@
 +3.10
 + * Add version command to cassandra-stress (CASSANDRA-12258)
 + * Create compaction-stress tool (CASSANDRA-11844)
 + * Garbage-collecting compaction operation and schema option (CASSANDRA-7019)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Add beta protocol flag for v5 native protocol (CASSANDRA-12142)
 + * Support filtering on non-PRIMARY KEY columns in the CREATE
 +   MATERIALIZED VIEW statement's WHERE clause (CASSANDRA-10368)
 + * Unify STDOUT and SYSTEMLOG logback format (CASSANDRA-12004)
 + * COPY FROM should raise error for non-existing input files (CASSANDRA-12174)
 + * Faster write path (CASSANDRA-12269)
 + * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424)
 + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
 + * Expose metrics for successful/failed authentication attempts 
(CASSANDRA-10635)
 + * Prepend snapshot name with "truncated" or "dropped" when a snapshot
 +   is taken before truncating or dropping a table (CASSANDRA-12178)
 + * Optimize RestrictionSet (CASSANDRA-12153)
 + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
 + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
 + * Create a system table to expose prepared statements (CASSANDRA-8831)
 + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
 + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
 + * Add supplied username to authentication error messages (CASSANDRA-12076)
 + * Remove pre-startup check for open JMX port (CASSANDRA-12074)
 + * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
 +
 +
  3.9
+  * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
   * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
   * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
   * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[stefania]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: c320f22a9260fc61e3547b89213e571284109233
Parents: f59a78b e89028d
Author: Stefania Alborghetti 
Authored: Tue Aug 2 10:07:46 2016 +0800
Committer: Stefania Alborghetti 
Committed: Tue Aug 2 10:07:46 2016 +0800

--
 CHANGES.txt |  1 +
 .../io/sstable/SSTableRewriterTest.java | 12 ++--
 .../io/sstable/SSTableWriterTestBase.java   | 20 
 3 files changed, 27 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c320f22a/CHANGES.txt
--
diff --cc CHANGES.txt
index f9ff43d,0f6bc50..1f5ad3a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,5 +1,32 @@@
 +3.10
 + * Add version command to cassandra-stress (CASSANDRA-12258)
 + * Create compaction-stress tool (CASSANDRA-11844)
 + * Garbage-collecting compaction operation and schema option (CASSANDRA-7019)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Add beta protocol flag for v5 native protocol (CASSANDRA-12142)
 + * Support filtering on non-PRIMARY KEY columns in the CREATE
 +   MATERIALIZED VIEW statement's WHERE clause (CASSANDRA-10368)
 + * Unify STDOUT and SYSTEMLOG logback format (CASSANDRA-12004)
 + * COPY FROM should raise error for non-existing input files (CASSANDRA-12174)
 + * Faster write path (CASSANDRA-12269)
 + * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424)
 + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
 + * Expose metrics for successful/failed authentication attempts 
(CASSANDRA-10635)
 + * Prepend snapshot name with "truncated" or "dropped" when a snapshot
 +   is taken before truncating or dropping a table (CASSANDRA-12178)
 + * Optimize RestrictionSet (CASSANDRA-12153)
 + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
 + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
 + * Create a system table to expose prepared statements (CASSANDRA-8831)
 + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
 + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
 + * Add supplied username to authentication error messages (CASSANDRA-12076)
 + * Remove pre-startup check for open JMX port (CASSANDRA-12074)
 + * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
 +
 +
  3.9
+  * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
   * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
   * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
  Merged from 3.0:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c320f22a/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[samt]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: 293908060bd8f8a94e5b6ec87dfd7aab457b4e61
Parents: a6430c8 b447ffc
Author: Sam Tunnicliffe 
Authored: Mon Aug 1 12:47:43 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Mon Aug 1 12:47:43 2016 +0100

--
 .../io/sstable/IndexSummaryManager.java | 14 +--
 .../io/sstable/IndexSummaryManagerTest.java | 95 ++--
 2 files changed, 74 insertions(+), 35 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[jmckenzie]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: 6284b6dccea10333735b4e6ad866e90f70d357aa
Parents: e1393ec 247a56b
Author: Josh McKenzie 
Authored: Wed Jul 27 11:40:09 2016 -0400
Committer: Josh McKenzie 
Committed: Wed Jul 27 11:40:09 2016 -0400

--
 conf/cassandra-env.ps1 | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[jmckenzie]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: a8f6a69452573fb4afa9a0752187fd946d8d04c7
Parents: e7dcbd6 ed90148
Author: Josh McKenzie 
Authored: Fri Jul 22 12:35:24 2016 -0400
Committer: Josh McKenzie 
Committed: Fri Jul 22 12:35:24 2016 -0400

--

--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[tylerhobbs]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: 5d9aab27656a4ae3bf3722fdeed45fcde9b3b311
Parents: e8907c1 7fbe42a
Author: Tyler Hobbs 
Authored: Wed Jul 20 15:40:20 2016 -0500
Committer: Tyler Hobbs 
Committed: Wed Jul 20 15:40:20 2016 -0500

--
 CHANGES.txt   |  2 ++
 .../org/apache/cassandra/transport/Frame.java |  5 -
 .../org/apache/cassandra/transport/Message.java   |  8 +++-
 .../cassandra/transport/ProtocolException.java| 18 ++
 .../transport/messages/ErrorMessage.java  | 13 -
 5 files changed, 43 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d9aab27/CHANGES.txt
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[aleksey]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: 058faff6f906c1b9f2c0e7b6eaa24361a34fe801
Parents: a6f5009 0b49b17
Author: Aleksey Yeschenko 
Authored: Wed Jul 20 15:03:42 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Wed Jul 20 15:03:42 2016 +0100

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/cql3handling.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/058faff6/CHANGES.txt
--
diff --cc CHANGES.txt
index 5fc87ee,ef80141..c51c9b1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
 +3.10
 + * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424)
 + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
 + * Expose metrics for successful/failed authentication attempts 
(CASSANDRA-10635)
 + * Prepend snapshot name with "truncated" or "dropped" when a snapshot
 +   is taken before truncating or dropping a table (CASSANDRA-12178)
 + * Optimize RestrictionSet (CASSANDRA-12153)
 + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
 + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
 + * Create a system table to expose prepared statements (CASSANDRA-8831)
 + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
 + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
 + * Add supplied username to authentication error messages (CASSANDRA-12076)
 + * Remove pre-startup check for open JMX port (CASSANDRA-12074)
 +
 +
  3.9
+  * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
   * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
  Merged from 3.0:
   * NullPointerExpception when reading/compacting table (CASSANDRA-11988)

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[samt]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: a41fb50750f0ff034daf1734f5a90c274b098f3b
Parents: c193c2c 9eae8d3
Author: Sam Tunnicliffe 
Authored: Wed Jul 20 13:06:25 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Wed Jul 20 13:06:25 2016 +0100

--
 CHANGES.txt |   2 +
 conf/cassandra-env.ps1  |  21 ++--
 conf/cassandra-env.sh   |  25 ++--
 .../cassandra/service/CassandraDaemon.java  |   1 -
 .../apache/cassandra/utils/JMXServerUtils.java  | 125 ---
 5 files changed, 132 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a41fb507/CHANGES.txt
--
diff --cc CHANGES.txt
index c34a76f,c9dce65..679f60f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
 +3.10
 + * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424)
 + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
 + * Expose metrics for successful/failed authentication attempts 
(CASSANDRA-10635)
 + * Prepend snapshot name with "truncated" or "dropped" when a snapshot
 +   is taken before truncating or dropping a table (CASSANDRA-12178)
 + * Optimize RestrictionSet (CASSANDRA-12153)
 + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
 + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
 + * Create a system table to expose prepared statements (CASSANDRA-8831)
 + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
 + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
 + * Add supplied username to authentication error messages (CASSANDRA-12076)
 + * Remove pre-startup check for open JMX port (CASSANDRA-12074)
 +
 +
  3.9
+  * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
  Merged from 3.0:
   * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
  Merged from 2.2:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a41fb507/src/java/org/apache/cassandra/service/CassandraDaemon.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[samt]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: 31637939e7fce91a3146daf64ff0eb102680a1ea
Parents: 614eebd 9ed4877
Author: Sam Tunnicliffe 
Authored: Tue Jul 19 18:30:43 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Tue Jul 19 18:30:43 2016 +0100

--
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/31637939/src/java/org/apache/cassandra/service/CassandraDaemon.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[jmckenzie]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: 614eebdff679318ae6c2c0a716b1c6d52f6a
Parents: 1291135 8049bc8
Author: Josh McKenzie 
Authored: Tue Jul 19 10:59:00 2016 -0400
Committer: Josh McKenzie 
Committed: Tue Jul 19 10:59:00 2016 -0400

--
 .../cassandra/db/commitlog/CommitLogTest.java   | 22 +---
 1 file changed, 15 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/614eebdf/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[slebresne]

Merge branch 'cassandra-3.9' into trunk

* cassandra-3.9:
  Fix RowIndexEntryTest so it don't use a primary key column for a cell


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

Branch: refs/heads/trunk
Commit: 249a155aaa05224cafc0fdb17b09e9c0d9d803e9
Parents: 7b7ca79 9659a38
Author: Sylvain Lebresne 
Authored: Tue Jul 19 10:03:38 2016 +0200
Committer: Sylvain Lebresne 
Committed: Tue Jul 19 10:03:38 2016 +0200

--
 src/java/org/apache/cassandra/db/rows/BufferCell.java| 1 +
 test/unit/org/apache/cassandra/db/RowIndexEntryTest.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/249a155a/test/unit/org/apache/cassandra/db/RowIndexEntryTest.java
--

[3/3] cassandra git commit: Merge branch cassandra-3.9 into trunk

[blerer]

Merge branch cassandra-3.9 into trunk


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

Branch: refs/heads/trunk
Commit: 26976160ebbd6a15092ed467e3f24d76b80ee43b
Parents: 35fbd7b 2764e85
Author: Benjamin Lerer 
Authored: Thu Jul 14 21:45:43 2016 +0200
Committer: Benjamin Lerer 
Committed: Thu Jul 14 21:46:15 2016 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/filter/DataLimits.java  |  3 +-
 .../validation/operations/SelectLimitTest.java  | 32 +++-
 3 files changed, 33 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26976160/CHANGES.txt
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[jake]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: ab2f744042764c66e8e6afed2418d5fb0caee8d7
Parents: de86ccf c1dcc9c
Author: T Jake Luciani 
Authored: Fri Jul 8 10:45:46 2016 -0400
Committer: T Jake Luciani 
Committed: Fri Jul 8 10:45:46 2016 -0400

--
 CHANGES.txt|  1 +
 .../src/org/apache/cassandra/stress/StressMetrics.java | 13 -
 2 files changed, 9 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab2f7440/CHANGES.txt
--
diff --cc CHANGES.txt
index c789b5e,b094b00..b65aad1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.10
 + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
 + * Add supplied username to authentication error messages (CASSANDRA-12076)
 + * Remove pre-startup check for open JMX port (CASSANDRA-12074)
 +
  3.9
+  * Fix hdr logging for single operation workloads (CASSANDRA-12145)
   * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
   * Increase size of flushExecutor thread pool (CASSANDRA-12071)
  Merged from 3.0:

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[stefania]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: 2444349e36ac28d74492bad7d15b6b66e6e53981
Parents: 1465f43 78f077d
Author: Stefania Alborghetti 
Authored: Wed Jul 6 12:58:57 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Jul 6 12:58:57 2016 +0800

--
 build.xml   |   2 +-
 conf/cassandra-env.ps1  |   9 --
 conf/cassandra-env.sh   |   9 --
 lib/licenses/netty-all-4.0.36.Final.txt | 202 +++
 lib/licenses/netty-all-4.0.37.Final.txt | 202 ---
 lib/netty-all-4.0.36.Final.jar  | Bin 0 -> 2195921 bytes
 lib/netty-all-4.0.37.Final.jar  | Bin 2204062 -> 0 bytes
 7 files changed, 203 insertions(+), 221 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2444349e/build.xml
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[tylerhobbs]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: b4ac32680973636d8dc05df94d49275aac588a64
Parents: 49c954e 32825a9
Author: Tyler Hobbs 
Authored: Tue Jul 5 11:47:41 2016 -0500
Committer: Tyler Hobbs 
Committed: Tue Jul 5 11:47:41 2016 -0500

--
 CHANGES.txt| 3 +++
 src/java/org/apache/cassandra/db/ReadResponse.java | 7 +--
 2 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4ac3268/CHANGES.txt
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[samt]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: 5d8d4893b967cff00e05f3a5b0fbbcd1ac06d00d
Parents: 71f3c91 cb0d1ca
Author: Sam Tunnicliffe 
Authored: Tue Jul 5 10:18:15 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Tue Jul 5 10:18:15 2016 +0100

--
 .../org/apache/cassandra/index/sasi/SASIIndexTest.java  |  4 ++--
 .../io/sstable/format/SSTableFlushObserverTest.java | 12 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

[marcuse]

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: dec1bdb20dcbacc8fba1ab8a14c16905a6384a34
Parents: f542a2e 44e475c
Author: Marcus Eriksson 
Authored: Mon Jul 4 14:17:51 2016 +0200
Committer: Marcus Eriksson 
Committed: Mon Jul 4 14:17:51 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dec1bdb2/CHANGES.txt
--
diff --cc CHANGES.txt
index 44b6699,b7330f0..309667e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 +3.10
 + * Remove pre-startup check for open JMX port (CASSANDRA-12074)
 +
  3.9
+  * Increase size of flushExecutor thread pool (CASSANDRA-12071)
  Merged from 3.0:
   * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
   * Fix EOF exception when altering column type (CASSANDRA-11820)