[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-09-04 Thread dbrosius 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 7d593b760cbf0e617d88ec1337fea43d53be660a
Parents: ca7256d 893fd21
Author: Dave Brosius 
Authored: Sun Sep 4 10:39:38 2016 -0400
Committer: Dave Brosius 
Committed: Sun Sep 4 10:39:38 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d593b76/CHANGES.txt
--
diff --cc CHANGES.txt
index 83060fb,798496a..c466dfe
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -146,15 -47,14 +146,16 @@@ 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)
+  * Fix NPE in SSTableLoader when specifying partial directory path 
(CASSANDRA-12609)
  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/7d593b76/src/java/org/apache/cassandra/tools/BulkLoader.java
--
diff --cc src/java/org/apache/cassandra/tools/BulkLoader.java
index 7d10cdc,9dba1b2..0f1c555
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@@ -42,18 -46,38 +42,18 @@@ import org.apache.cassandra.utils.Outpu
  
  public class BulkLoader
  {
 -private static final String TOOL_NAME = "sstableloader";
 -private static final String VERBOSE_OPTION  = "verbose";
 -private static final String HELP_OPTION  = "help";
 -private static final String NOPROGRESS_OPTION  = "no-progress";
 -private static final String IGNORE_NODES_OPTION  = "ignore";
 -private static final String INITIAL_HOST_ADDRESS_OPTION = "nodes";
 -private static final String NATIVE_PORT_OPTION = "port";
 -private static final String USER_OPTION = "username";
 -private static final String PASSWD_OPTION = "password";
 -private static final String AUTH_PROVIDER_OPTION = "auth-provider";
 -private static final String THROTTLE_MBITS = "throttle";
 -private static final String INTER_DC_THROTTLE_MBITS = "inter-dc-throttle";
 -
 -/* client encryption options */
 -private static final String SSL_TRUSTSTORE = "truststore";
 -private static final String SSL_TRUSTSTORE_PW = "truststore-password";
 -private static final String SSL_KEYSTORE = "keystore";
 -private static final String SSL_KEYSTORE_PW = "keystore-password";
 -private static final String SSL_PROTOCOL = "ssl-protocol";
 -private static final String SSL_ALGORITHM = "ssl-alg";
 -private static final String SSL_STORE_TYPE = "store-type";
 -private static final String SSL_CIPHER_SUITES = "ssl-ciphers";
 -private static final String CONNECTIONS_PER_HOST = "connections-per-host";
 -private static final String CONFIG_PATH = "conf-path";
 -
 -public static void main(String args[])
 +public static void main(String args[]) throws BulkLoadException
  {
 -Config.setClientMode(true);
 -LoaderOptions options =

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-09-03 Thread dbrosius 
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 
Authored: Sun Sep 4 01:17:12 2016 -0400
Committer: Dave Brosius 
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
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-06-23 Thread tylerhobbs 
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/ff8d078c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff8d078c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff8d078c

Branch: refs/heads/trunk
Commit: ff8d078c5b9ce8a04a6d7b77d379bd871e54d5b8
Parents: fc7785b edaa693
Author: Tyler Hobbs 
Authored: Thu Jun 23 10:36:03 2016 -0500
Committer: Tyler Hobbs 
Committed: Thu Jun 23 10:36:03 2016 -0500

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/copyutil.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff8d078c/CHANGES.txt
--
diff --cc CHANGES.txt
index f5843ec,488fde3..eec4d66
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
 -3.0.8
 +3.8
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 + * Add Change-Data-Capture (CASSANDRA-8844)
 +Merged from 3.0:
+  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff8d078c/pylib/cqlshlib/copyutil.py
--

[2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk

2016-05-02 Thread blerer 
Merge branch cassandra-3.0 into trunk


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

Branch: refs/heads/trunk
Commit: 4edd9ed5e98dca9c8ebf52fa40a1f8abb0031689
Parents: 7b0c716 89464ea
Author: Benjamin Lerer 
Authored: Mon May 2 14:17:48 2016 +0200
Committer: Benjamin Lerer 
Committed: Mon May 2 14:20:31 2016 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/cql3/AbstractConditions.java  |  5 ++-
 .../apache/cassandra/cql3/AbstractMarker.java   |  4 +--
 .../org/apache/cassandra/cql3/Attributes.java   | 15 -
 .../apache/cassandra/cql3/ColumnCondition.java  | 11 +++
 .../apache/cassandra/cql3/ColumnConditions.java |  9 ++
 .../org/apache/cassandra/cql3/Conditions.java   |  8 +++--
 src/java/org/apache/cassandra/cql3/Json.java|  4 +--
 src/java/org/apache/cassandra/cql3/Lists.java   |  4 +--
 src/java/org/apache/cassandra/cql3/Maps.java|  8 ++---
 .../org/apache/cassandra/cql3/Operation.java|  7 ++--
 .../org/apache/cassandra/cql3/Operations.java   |  9 ++
 src/java/org/apache/cassandra/cql3/Sets.java|  6 ++--
 src/java/org/apache/cassandra/cql3/Term.java|  5 ++-
 src/java/org/apache/cassandra/cql3/Terms.java   | 22 +++--
 src/java/org/apache/cassandra/cql3/Tuples.java  |  4 +--
 .../org/apache/cassandra/cql3/UserTypes.java|  4 +--
 .../cql3/functions/AbstractFunction.java|  5 ++-
 .../cassandra/cql3/functions/Function.java  |  2 +-
 .../cassandra/cql3/functions/FunctionCall.java  |  7 ++--
 .../cassandra/cql3/functions/UDAggregate.java   | 18 ++-
 .../restrictions/MultiColumnRestriction.java| 18 +--
 .../cql3/restrictions/Restriction.java  |  8 ++---
 .../cql3/restrictions/RestrictionSet.java   | 18 +--
 .../restrictions/RestrictionSetWrapper.java |  4 +--
 .../restrictions/SingleColumnRestriction.java   | 34 +---
 .../restrictions/StatementRestrictions.java |  9 +++---
 .../cassandra/cql3/restrictions/TermSlice.java  | 19 ---
 .../cql3/restrictions/TokenFilter.java  | 18 +--
 .../cql3/restrictions/TokenRestriction.java |  8 ++---
 .../selection/AbstractFunctionSelector.java |  7 ++--
 .../cassandra/cql3/selection/Selection.java |  7 ++--
 .../cassandra/cql3/selection/Selector.java  |  5 ++-
 .../cql3/selection/SelectorFactories.java   |  9 ++
 .../cql3/statements/BatchStatement.java |  4 +--
 .../statements/CreateAggregateStatement.java|  6 ++--
 .../cql3/statements/ModificationStatement.java  | 15 ++---
 .../cql3/statements/SelectStatement.java| 19 ---
 38 files changed, 165 insertions(+), 201 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4edd9ed5/CHANGES.txt
--
diff --cc CHANGES.txt
index 984ad55,95db7bc..c49249c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,68 -1,5 +1,69 @@@
 -3.0.6
 +3.6
 + * Integrated JMX authentication and authorization (CASSANDRA-10091)
 + * Add units to stress ouput (CASSANDRA-11352)
 + * Fix PER PARTITION LIMIT for single and multi partitions queries 
(CASSANDRA-11603)
 + * Add uncompressed chunk cache for RandomAccessReader (CASSANDRA-5863)
 + * Clarify ClusteringPrefix hierarchy (CASSANDRA-11213)
 + * Always perform collision check before joining ring (CASSANDRA-10134)
 + * SSTableWriter output discrepancy (CASSANDRA-11646)
 + * Fix potential timeout in NativeTransportService.testConcurrentDestroys 
(CASSANDRA-10756)
 + * Support large partitions on the 3.0 sstable format (CASSANDRA-11206)
 + * Add support to rebuild from specific range (CASSANDRA-10406)
 + * Optimize the overlapping lookup by calculating all the
 +   bounds in advance (CASSANDRA-11571)
 + * Support json/yaml output in noetool tablestats (CASSANDRA-5977)
 + * (stress) Add datacenter option to -node options (CASSANDRA-11591)
 + * Fix handling of empty slices (CASSANDRA-11513)
 + * Make number of cores used by cqlsh COPY visible to testing code 
(CASSANDRA-11437)
 + * Allow filtering on clustering columns for queries without secondary 
indexes (CASSANDRA-11310)
 + * Refactor Restriction hierarchy (CASSANDRA-11354)
 + * Eliminate allocations in R/W path (CASSANDRA-11421)
 + * Update Netty to 4.0.36 (CASSANDRA-11567)
 + * Fix PER PARTITION LIMIT for queries requiring post-query ordering 
(CASSANDRA-11556)
 + * Allow instantiation of UDTs and tuples in UDFs (CASSANDRA-10818)
 + * Support UDT in CQLSSTableWriter (CASSANDRA-10624)
 + * Support for non-frozen user-defined types, updating
 +

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-05-02 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: a62f70dd1a8eda18368e845dcee0627df10e9191
Parents: 1800a5b c83f20a
Author: Sylvain Lebresne 
Authored: Mon May 2 12:16:42 2016 +0200
Committer: Sylvain Lebresne 
Committed: Mon May 2 12:16:42 2016 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/rows/AbstractCell.java  | 15 ++--
 test/unit/org/apache/cassandra/db/CellTest.java | 77 +++-
 3 files changed, 86 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a62f70dd/CHANGES.txt
--
diff --cc CHANGES.txt
index d30b7a4,887ed19..d557846
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,68 -1,5 +1,69 @@@
 -3.0.6
 +3.6
 + * Add units to stress ouput (CASSANDRA-11352)
 + * Fix PER PARTITION LIMIT for single and multi partitions queries 
(CASSANDRA-11603)
 + * Add uncompressed chunk cache for RandomAccessReader (CASSANDRA-5863)
 + * Clarify ClusteringPrefix hierarchy (CASSANDRA-11213)
 + * Always perform collision check before joining ring (CASSANDRA-10134)
 + * SSTableWriter output discrepancy (CASSANDRA-11646)
 + * Fix potential timeout in NativeTransportService.testConcurrentDestroys 
(CASSANDRA-10756)
 + * Support large partitions on the 3.0 sstable format (CASSANDRA-11206)
 + * Add support to rebuild from specific range (CASSANDRA-10406)
 + * Optimize the overlapping lookup by calculating all the
 +   bounds in advance (CASSANDRA-11571)
 + * Support json/yaml output in noetool tablestats (CASSANDRA-5977)
 + * (stress) Add datacenter option to -node options (CASSANDRA-11591)
 + * Fix handling of empty slices (CASSANDRA-11513)
 + * Make number of cores used by cqlsh COPY visible to testing code 
(CASSANDRA-11437)
 + * Allow filtering on clustering columns for queries without secondary 
indexes (CASSANDRA-11310)
 + * Refactor Restriction hierarchy (CASSANDRA-11354)
 + * Eliminate allocations in R/W path (CASSANDRA-11421)
 + * Update Netty to 4.0.36 (CASSANDRA-11567)
 + * Fix PER PARTITION LIMIT for queries requiring post-query ordering 
(CASSANDRA-11556)
 + * Allow instantiation of UDTs and tuples in UDFs (CASSANDRA-10818)
 + * Support UDT in CQLSSTableWriter (CASSANDRA-10624)
 + * Support for non-frozen user-defined types, updating
 +   individual fields of user-defined types (CASSANDRA-7423)
 + * Make LZ4 compression level configurable (CASSANDRA-11051)
 + * Allow per-partition LIMIT clause in CQL (CASSANDRA-7017)
 + * Make custom filtering more extensible with UserExpression (CASSANDRA-11295)
 + * Improve field-checking and error reporting in cassandra.yaml 
(CASSANDRA-10649)
 + * Print CAS stats in nodetool proxyhistograms (CASSANDRA-11507)
 + * More user friendly error when providing an invalid token to nodetool 
(CASSANDRA-9348)
 + * Add static column support to SASI index (CASSANDRA-11183)
 + * Support EQ/PREFIX queries in SASI CONTAINS mode without tokenization 
(CASSANDRA-11434)
 + * Support LIKE operator in prepared statements (CASSANDRA-11456)
 + * Add a command to see if a Materialized View has finished building 
(CASSANDRA-9967)
 + * Log endpoint and port associated with streaming operation (CASSANDRA-8777)
 + * Print sensible units for all log messages (CASSANDRA-9692)
 + * Upgrade Netty to version 4.0.34 (CASSANDRA-11096)
 + * Break the CQL grammar into separate Parser and Lexer (CASSANDRA-11372)
 + * Compress only inter-dc traffic by default (CASSANDRA-)
 + * Add metrics to track write amplification (CASSANDRA-11420)
 + * cassandra-stress: cannot handle "value-less" tables (CASSANDRA-7739)
 + * Add/drop multiple columns in one ALTER TABLE statement (CASSANDRA-10411)
 + * Add require_endpoint_verification opt for internode encryption 
(CASSANDRA-9220)
 + * Add auto import java.util for UDF code block (CASSANDRA-11392)
 + * Add --hex-format option to nodetool getsstables (CASSANDRA-11337)
 + * sstablemetadata should print sstable min/max token (CASSANDRA-7159)
 + * Do not wrap CassandraException in TriggerExecutor (CASSANDRA-9421)
 + * COPY TO should have higher double precision (CASSANDRA-11255)
 + * Stress should exit with non-zero status after failure (CASSANDRA-10340)
 + * Add client to cqlsh SHOW_SESSION (CASSANDRA-8958)
 + * Fix nodetool tablestats keyspace level metrics (CASSANDRA-11226)
 + * Store repair options in parent_repair_history (CASSANDRA-11244)
 + * Print current leveling in sstableofflinerelevel (CASSANDRA-9588)
 + * Change repair message for keyspaces

[2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk

2016-04-29 Thread blerer 
Merge branch cassandra-3.0 into trunk


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

Branch: refs/heads/trunk
Commit: 5b850223c92fd96827a2543b51e1adc32edb15c3
Parents: 30bb255 474d3bf
Author: Benjamin Lerer 
Authored: Fri Apr 29 12:08:18 2016 +0200
Committer: Benjamin Lerer 
Committed: Fri Apr 29 12:08:18 2016 +0200

--
 CHANGES.txt |   1 +
 .../cassandra/db/PartitionRangeReadCommand.java |   5 +-
 .../service/pager/PartitionRangeQueryPager.java | 130 ++
 .../service/pager/RangeNamesQueryPager.java |  92 -
 .../service/pager/RangeSliceQueryPager.java | 131 ---
 5 files changed, 132 insertions(+), 227 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b850223/CHANGES.txt
--
diff --cc CHANGES.txt
index 4f7d6dd,268d011..c87f654
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,5 +1,66 @@@
 -3.0.6
 +3.6
 + * Add uncompressed chunk cache for RandomAccessReader (CASSANDRA-5863)
 + * Clarify ClusteringPrefix hierarchy (CASSANDRA-11213)
 + * Always perform collision check before joining ring (CASSANDRA-10134)
 + * SSTableWriter output discrepancy (CASSANDRA-11646)
 + * Fix potential timeout in NativeTransportService.testConcurrentDestroys 
(CASSANDRA-10756)
 + * Support large partitions on the 3.0 sstable format (CASSANDRA-11206)
 + * Add support to rebuild from specific range (CASSANDRA-10406)
 + * Optimize the overlapping lookup by calculating all the
 +   bounds in advance (CASSANDRA-11571)
 + * Support json/yaml output in noetool tablestats (CASSANDRA-5977)
 + * (stress) Add datacenter option to -node options (CASSANDRA-11591)
 + * Fix handling of empty slices (CASSANDRA-11513)
 + * Make number of cores used by cqlsh COPY visible to testing code 
(CASSANDRA-11437)
 + * Allow filtering on clustering columns for queries without secondary 
indexes (CASSANDRA-11310)
 + * Refactor Restriction hierarchy (CASSANDRA-11354)
 + * Eliminate allocations in R/W path (CASSANDRA-11421)
 + * Update Netty to 4.0.36 (CASSANDRA-11567)
 + * Fix PER PARTITION LIMIT for queries requiring post-query ordering 
(CASSANDRA-11556)
 + * Allow instantiation of UDTs and tuples in UDFs (CASSANDRA-10818)
 + * Support UDT in CQLSSTableWriter (CASSANDRA-10624)
 + * Support for non-frozen user-defined types, updating
 +   individual fields of user-defined types (CASSANDRA-7423)
 + * Make LZ4 compression level configurable (CASSANDRA-11051)
 + * Allow per-partition LIMIT clause in CQL (CASSANDRA-7017)
 + * Make custom filtering more extensible with UserExpression (CASSANDRA-11295)
 + * Improve field-checking and error reporting in cassandra.yaml 
(CASSANDRA-10649)
 + * Print CAS stats in nodetool proxyhistograms (CASSANDRA-11507)
 + * More user friendly error when providing an invalid token to nodetool 
(CASSANDRA-9348)
 + * Add static column support to SASI index (CASSANDRA-11183)
 + * Support EQ/PREFIX queries in SASI CONTAINS mode without tokenization 
(CASSANDRA-11434)
 + * Support LIKE operator in prepared statements (CASSANDRA-11456)
 + * Add a command to see if a Materialized View has finished building 
(CASSANDRA-9967)
 + * Log endpoint and port associated with streaming operation (CASSANDRA-8777)
 + * Print sensible units for all log messages (CASSANDRA-9692)
 + * Upgrade Netty to version 4.0.34 (CASSANDRA-11096)
 + * Break the CQL grammar into separate Parser and Lexer (CASSANDRA-11372)
 + * Compress only inter-dc traffic by default (CASSANDRA-)
 + * Add metrics to track write amplification (CASSANDRA-11420)
 + * cassandra-stress: cannot handle "value-less" tables (CASSANDRA-7739)
 + * Add/drop multiple columns in one ALTER TABLE statement (CASSANDRA-10411)
 + * Add require_endpoint_verification opt for internode encryption 
(CASSANDRA-9220)
 + * Add auto import java.util for UDF code block (CASSANDRA-11392)
 + * Add --hex-format option to nodetool getsstables (CASSANDRA-11337)
 + * sstablemetadata should print sstable min/max token (CASSANDRA-7159)
 + * Do not wrap CassandraException in TriggerExecutor (CASSANDRA-9421)
 + * COPY TO should have higher double precision (CASSANDRA-11255)
 + * Stress should exit with non-zero status after failure (CASSANDRA-10340)
 + * Add client to cqlsh SHOW_SESSION (CASSANDRA-8958)
 + * Fix nodetool tablestats keyspace level metrics (CASSANDRA-11226)
 + * Store repair options in parent_repair_history (CASSANDRA-11244)
 + * Print current leveling in sstableofflinerelevel (CASSANDRA-9588)
 + * Change repair message for keyspaces

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-21 Thread tylerhobbs 
Merge branch 'cassandra-3.0' into trunk

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/StorageService.java
src/java/org/apache/cassandra/service/StorageServiceMBean.java


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

Branch: refs/heads/trunk
Commit: de1a96c8d401f706558e5841dfce5da85b408b26
Parents: 848352f a4e1182
Author: Tyler Hobbs 
Authored: Thu Apr 21 16:18:06 2016 -0500
Committer: Tyler Hobbs 
Committed: Thu Apr 21 16:18:06 2016 -0500

--
 CHANGES.txt |  2 ++
 .../org/apache/cassandra/config/Schema.java | 13 ++
 src/java/org/apache/cassandra/db/Keyspace.java  |  5 
 .../cassandra/db/SizeEstimatesRecorder.java |  2 +-
 .../org/apache/cassandra/dht/BootStrapper.java  |  3 +--
 .../service/PendingRangeCalculatorService.java  |  6 +++--
 .../cassandra/service/StorageService.java   | 27 +++-
 .../cassandra/service/StorageServiceMBean.java  |  2 ++
 .../org/apache/cassandra/tools/NodeProbe.java   |  5 
 .../org/apache/cassandra/tools/NodeTool.java| 21 ---
 .../cassandra/tools/nodetool/Cleanup.java   |  2 +-
 .../apache/cassandra/tools/nodetool/Repair.java |  2 +-
 .../apache/cassandra/dht/BootStrapperTest.java  |  2 +-
 .../cassandra/locator/SimpleStrategyTest.java   |  4 +--
 .../service/LeaveAndBootstrapTest.java  |  4 +--
 .../org/apache/cassandra/service/MoveTest.java  |  4 +--
 16 files changed, 75 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1a96c8/CHANGES.txt
--
diff --cc CHANGES.txt
index a0c7df6,0ec6aef..0704c57
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,61 -1,6 +1,63 @@@
 -3.0.6
 +3.6
 + * Support large partitions on the 3.0 sstable format (CASSANDRA-11206)
 + * JSON datetime formatting needs timezone (CASSANDRA-11137)
 + * Add support to rebuild from specific range (CASSANDRA-10409)
 + * Optimize the overlapping lookup by calculating all the
 +   bounds in advance (CASSANDRA-11571)
 + * Support json/yaml output in noetool tablestats (CASSANDRA-5977)
 + * (stress) Add datacenter option to -node options (CASSANDRA-11591)
 + * Fix handling of empty slices (CASSANDRA-11513)
 + * Make number of cores used by cqlsh COPY visible to testing code 
(CASSANDRA-11437)
 + * Allow filtering on clustering columns for queries without secondary 
indexes (CASSANDRA-11310)
 + * Refactor Restriction hierarchy (CASSANDRA-11354)
 + * Eliminate allocations in R/W path (CASSANDRA-11421)
 + * Update Netty to 4.0.36 (CASSANDRA-11567)
 + * Fix PER PARTITION LIMIT for queries requiring post-query ordering 
(CASSANDRA-11556)
 + * Allow instantiation of UDTs and tuples in UDFs (CASSANDRA-10818)
 + * Support UDT in CQLSSTableWriter (CASSANDRA-10624)
 + * Support for non-frozen user-defined types, updating
 +   individual fields of user-defined types (CASSANDRA-7423)
 + * Make LZ4 compression level configurable (CASSANDRA-11051)
 + * Allow per-partition LIMIT clause in CQL (CASSANDRA-7017)
 + * Make custom filtering more extensible with UserExpression (CASSANDRA-11295)
 + * Improve field-checking and error reporting in cassandra.yaml 
(CASSANDRA-10649)
 + * Print CAS stats in nodetool proxyhistograms (CASSANDRA-11507)
 + * More user friendly error when providing an invalid token to nodetool 
(CASSANDRA-9348)
 + * Add static column support to SASI index (CASSANDRA-11183)
 + * Support EQ/PREFIX queries in SASI CONTAINS mode without tokenization 
(CASSANDRA-11434)
 + * Support LIKE operator in prepared statements (CASSANDRA-11456)
 + * Add a command to see if a Materialized View has finished building 
(CASSANDRA-9967)
 + * Log endpoint and port associated with streaming operation (CASSANDRA-8777)
 + * Print sensible units for all log messages (CASSANDRA-9692)
 + * Upgrade Netty to version 4.0.34 (CASSANDRA-11096)
 + * Break the CQL grammar into separate Parser and Lexer (CASSANDRA-11372)
 + * Compress only inter-dc traffic by default (CASSANDRA-)
 + * Add metrics to track write amplification (CASSANDRA-11420)
 + * cassandra-stress: cannot handle "value-less" tables (CASSANDRA-7739)
 + * Add/drop multiple columns in one ALTER TABLE statement (CASSANDRA-10411)
 + * Add require_endpoint_verification opt for internode encryption 
(CASSANDRA-9220)
 + * Add auto import java.util for UDF code block (CASSANDRA-11392)
 + * Add --hex-format option to nodetool getsstables (CASSANDRA-11337)
 + * sstablemetadata should print sstable min/max token (CASSANDRA-7159)
 + * Do not

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-13 Thread tylerhobbs 
Merge branch 'cassandra-3.0' into trunk

Conflicts:
build.xml


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

Branch: refs/heads/trunk
Commit: ea0a972639510c54f35e1ec40023ef19f9c088f7
Parents: cc90d04 fd24b7c
Author: Tyler Hobbs 
Authored: Wed Apr 13 12:53:22 2016 -0500
Committer: Tyler Hobbs 
Committed: Wed Apr 13 12:53:22 2016 -0500

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-05 Thread tylerhobbs 
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/ce747b85
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce747b85
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce747b85

Branch: refs/heads/trunk
Commit: ce747b8505d86992f09220390f78c39c4f716e06
Parents: 87fdc9b 1681c18
Author: Tyler Hobbs 
Authored: Tue Apr 5 14:04:49 2016 -0500
Committer: Tyler Hobbs 
Committed: Tue Apr 5 14:04:49 2016 -0500

--
 CHANGES.txt |  2 ++
 .../org/apache/cassandra/transport/Frame.java   | 11 +++---
 .../cassandra/transport/ProtocolErrorTest.java  | 23 
 3 files changed, 33 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce747b85/CHANGES.txt
--
diff --cc CHANGES.txt
index f30210a,8f4329a..05fda52
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,6 +1,40 @@@
 -3.0.6
 +3.6
 + * More user friendly error when providing an invalid token to nodetool 
(CASSANDRA-9348)
 + * Add static column support to SASI index (CASSANDRA-11183)
 + * Support EQ/PREFIX queries in SASI CONTAINS mode without tokenization 
(CASSANDRA-11434)
 + * Support LIKE operator in prepared statements (CASSANDRA-11456)
 + * Add a command to see if a Materialized View has finished building 
(CASSANDRA-9967)
 + * Log endpoint and port associated with streaming operation (CASSANDRA-8777)
 + * Print sensible units for all log messages (CASSANDRA-9692)
 + * Upgrade Netty to version 4.0.34 (CASSANDRA-11096)
 + * Break the CQL grammar into separate Parser and Lexer (CASSANDRA-11372)
 + * Compress only inter-dc traffic by default (CASSANDRA-)
 + * Add metrics to track write amplification (CASSANDRA-11420)
 + * cassandra-stress: cannot handle "value-less" tables (CASSANDRA-7739)
 + * Add/drop multiple columns in one ALTER TABLE statement (CASSANDRA-10411)
 + * Add require_endpoint_verification opt for internode encryption 
(CASSANDRA-9220)
 + * Add auto import java.util for UDF code block (CASSANDRA-11392)
 + * Add --hex-format option to nodetool getsstables (CASSANDRA-11337)
 + * sstablemetadata should print sstable min/max token (CASSANDRA-7159)
 + * Do not wrap CassandraException in TriggerExecutor (CASSANDRA-9421)
 + * COPY TO should have higher double precision (CASSANDRA-11255)
 + * Stress should exit with non-zero status after failure (CASSANDRA-10340)
 + * Add client to cqlsh SHOW_SESSION (CASSANDRA-8958)
 + * Fix nodetool tablestats keyspace level metrics (CASSANDRA-11226)
 + * Store repair options in parent_repair_history (CASSANDRA-11244)
 + * Print current leveling in sstableofflinerelevel (CASSANDRA-9588)
 + * Change repair message for keyspaces with RF 1 (CASSANDRA-11203)
 + * Remove hard-coded SSL cipher suites and protocols (CASSANDRA-10508)
 + * Improve concurrency in CompactionStrategyManager (CASSANDRA-10099)
 + * (cqlsh) interpret CQL type for formatting blobs (CASSANDRA-11274)
 + * Refuse to start and print txn log information in case of disk
 +   corruption (CASSANDRA-10112)
 + * Resolve some eclipse-warnings (CASSANDRA-11086)
 + * (cqlsh) Show static columns in a different color (CASSANDRA-11059)
 + * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207)
 +Merged from 3.0:
+  * Properly respond with ProtocolError when a v1/v2 native protocol
+header is received (CASSANDRA-11464)
   * Validate that num_tokens and initial_token are consistent with one another 
(CASSANDRA-10120)
  Merged from 2.2:
   * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-29 Thread jake 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 0b76ef07da8a1b79f69820efc2482a0ca9a4d78e
Parents: 1fce648 0a35341
Author: T Jake Luciani 
Authored: Mon Feb 29 10:32:44 2016 -0500
Committer: T Jake Luciani 
Committed: Mon Feb 29 10:32:44 2016 -0500

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b76ef07/src/java/org/apache/cassandra/service/StorageService.java
--

[2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk

2016-02-19 Thread blerer 
Merge branch cassandra-3.0 into trunk


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

Branch: refs/heads/trunk
Commit: acb2ab0723752e6e21877413866e9e7872194ffd
Parents: b3eeadf a283890
Author: Benjamin Lerer 
Authored: Fri Feb 19 16:17:16 2016 +0100
Committer: Benjamin Lerer 
Committed: Fri Feb 19 16:17:27 2016 +0100

--

--

[2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk

2016-02-17 Thread blerer 
Merge branch cassandra-3.0 into trunk


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

Branch: refs/heads/trunk
Commit: 0d8e853d923676331f4f336d9455089cc431535d
Parents: 09fd433 7a3c3ab
Author: Benjamin Lerer 
Authored: Wed Feb 17 11:56:48 2016 +0100
Committer: Benjamin Lerer 
Committed: Wed Feb 17 11:56:48 2016 +0100

--
 CHANGES.txt |  3 +
 .../cql3/statements/AlterTypeStatement.java | 28 +---
 .../cql3/statements/DropTypeStatement.java  | 40 ++--
 .../db/marshal/AbstractCompositeType.java   |  6 ++
 .../cassandra/db/marshal/AbstractType.java  |  7 +-
 .../cassandra/db/marshal/CompositeType.java | 11 
 .../apache/cassandra/db/marshal/ListType.java   |  4 +-
 .../apache/cassandra/db/marshal/MapType.java|  5 +-
 .../cassandra/db/marshal/ReversedType.java  |  4 +-
 .../apache/cassandra/db/marshal/SetType.java|  4 +-
 .../apache/cassandra/db/marshal/TupleType.java  |  9 +--
 .../apache/cassandra/db/marshal/UserType.java   |  9 ++-
 .../cql3/validation/entities/UserTypesTest.java | 68 
 .../commitlog/CommitLogSegmentManagerTest.java  | 63 ++
 14 files changed, 184 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d8e853d/CHANGES.txt
--
diff --cc CHANGES.txt
index 376035d,f1a9719..2d0a727
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,5 +1,31 @@@
 +3.4
 + * fix SASI memtable switching on flush (CASSANDRA-11159)
 + * Remove duplicate offline compaction tracking (CASSANDRA-11148)
 + * fix EQ semantics of analyzed SASI indexes (CASSANDRA-11130)
 + * Support long name output for nodetool commands (CASSANDRA-7950)
 + * Encrypted hints (CASSANDRA-11040)
 + * SASI index options validation (CASSANDRA-11136)
 + * Optimize disk seek using min/max column name meta data when the LIMIT 
clause is used
 +   (CASSANDRA-8180)
 + * Add LIKE support to CQL3 (CASSANDRA-11067)
 + * Generic Java UDF types (CASSANDRA-10819)
 + * cqlsh: Include sub-second precision in timestamps by default 
(CASSANDRA-10428)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Integrate SASI index into Cassandra (CASSANDRA-10661)
 + * Add --skip-flush option to nodetool snapshot
 + * Skip values for non-queried columns (CASSANDRA-10657)
 + * Add support for secondary indexes on static columns (CASSANDRA-8103)
 + * CommitLogUpgradeTestMaker creates broken commit logs (CASSANDRA-11051)
 + * Add metric for number of dropped mutations (CASSANDRA-10866)
 + * Simplify row cache invalidation code (CASSANDRA-10396)
 + * Support user-defined compaction through nodetool (CASSANDRA-10660)
 + * Stripe view locks by key and table ID to reduce contention 
(CASSANDRA-10981)
 + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953)
 + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838)
 +Merged from 3.0:
++===
+ 3.0.4
+  * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)
   * Add query time validation method on Index (CASSANDRA-11043)
   * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
   * Properly handle hinted handoff after topology changes (CASSANDRA-5902)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d8e853d/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d8e853d/src/java/org/apache/cassandra/db/marshal/CompositeType.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d8e853d/src/java/org/apache/cassandra/db/marshal/TupleType.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-04 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: b51f9495e5f1dc9573aa08139009569a1916f82f
Parents: c164e51 f340362
Author: Robert Stupp 
Authored: Thu Feb 4 19:32:41 2016 +0100
Committer: Robert Stupp 
Committed: Thu Feb 4 19:33:21 2016 +0100

--
 CHANGES.txt  |   3 +++
 ...-core-3.0.0-beta1-bb1bce4-SNAPSHOT-shaded.jar | Bin 2288891 -> 0 bytes
 lib/cassandra-driver-core-3.0.0-shaded.jar   | Bin 0 -> 2433676 bytes
 .../cassandra/cql3/functions/UDHelper.java   |   2 +-
 .../cassandra/hadoop/cql3/CqlConfigHelper.java   |  10 +++---
 .../org/apache/cassandra/tools/BulkLoader.java   |   6 +-
 .../cassandra/cql3/IndexQueryPagingTest.java |   3 ++-
 .../cql3/validation/entities/UFTest.java |   8 
 .../cassandra/stress/util/JavaDriverClient.java  |   8 +---
 9 files changed, 27 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b51f9495/CHANGES.txt
--
diff --cc CHANGES.txt
index f53393d,21ae788..1d2fbb7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,8 +1,26 @@@
 -3.0.4
 +3.4
 + * cqlsh: Include sub-second precision in timestamps by default 
(CASSANDRA-10428)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Integrate SASI index into Cassandra (CASSANDRA-10661)
 + * Add --skip-flush option to nodetool snapshot
 + * Skip values for non-queried columns (CASSANDRA-10657)
 + * Add support for secondary indexes on static columns (CASSANDRA-8103)
 + * CommitLogUpgradeTestMaker creates broken commit logs (CASSANDRA-11051)
 + * Add metric for number of dropped mutations (CASSANDRA-10866)
 + * Simplify row cache invalidation code (CASSANDRA-10396)
 + * Support user-defined compaction through nodetool (CASSANDRA-10660)
 + * Stripe view locks by key and table ID to reduce contention 
(CASSANDRA-10981)
 + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953)
 + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838)
++Merged from 3.0:
+  * Hadoop integration is incompatible with Cassandra Driver 3.0.0 
(CASSANDRA-11001)
+ 
  
 -3.0.3
 +3.3
 + * Avoid infinite loop if owned range is smaller than number of
 +   data dirs (CASSANDRA-11034)
 + * Avoid bootstrap hanging when existing nodes have no data to stream 
(CASSANDRA-11010)
 +Merged from 3.0:
   * Remove double initialization of newly added tables (CASSANDRA-11027)
   * Filter keys searcher results by target range (CASSANDRA-11104)
   * Fix deserialization of legacy read commands (CASSANDRA-11087)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-01-04 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 691627bb2336fbcddebf814fb5c675a1039ee370
Parents: f54eab7 f5416e3
Author: Robert Stupp 
Authored: Mon Jan 4 20:10:46 2016 +0100
Committer: Robert Stupp 
Committed: Mon Jan 4 20:10:46 2016 +0100

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


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

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-01-04 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: d0e20364529b8c037bc14d95f477d8bf6caf2ff2
Parents: 6b7db8a e4eabd9
Author: Robert Stupp 
Authored: Mon Jan 4 16:34:43 2016 +0100
Committer: Robert Stupp 
Committed: Mon Jan 4 16:34:43 2016 +0100

--
 .../cassandra/cql3/functions/AggregateFcts.java | 230 ++-
 .../cql3/validation/entities/UFTest.java|  26 +++
 .../validation/operations/AggregationTest.java  |  41 
 3 files changed, 239 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0e20364/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0e20364/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-31 Thread tylerhobbs 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 5f83f6c2989d756f9c509ad0d4ae49034260e0e6
Parents: 80c51c0 4d0f140
Author: Tyler Hobbs 
Authored: Thu Dec 31 15:33:31 2015 -0600
Committer: Tyler Hobbs 
Committed: Thu Dec 31 15:33:31 2015 -0600

--
 doc/cql3/CQL.textile | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f83f6c2/doc/cql3/CQL.textile
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-30 Thread marcuse 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 2a6aa8cfb71c89de43cc1ab69050f3244481dc10
Parents: 2601639 3d78939
Author: Marcus Eriksson 
Authored: Wed Dec 30 09:00:10 2015 +0100
Committer: Marcus Eriksson 
Committed: Wed Dec 30 09:00:10 2015 +0100

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/streaming/StreamReceiveTask.java | 6 --
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a6aa8cf/CHANGES.txt
--
diff --cc CHANGES.txt
index 17829d7,dd517f5..5cd1b4c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,7 +1,31 @@@
 -3.0.3
 +3.2
 + * Add forceUserDefinedCleanup to allow more flexible cleanup 
(CASSANDRA-10708)
 + * (cqlsh) allow setting TTL with COPY (CASSANDRA-9494)
+  * Fix counting of received sstables in streaming (CASSANDRA-10949)
   * Implement hints compression (CASSANDRA-9428)
   * Fix potential assertion error when reading static columns (CASSANDRA-10903)
 + * Fix EstimatedHistogram creation in nodetool tablehistograms 
(CASSANDRA-10859)
 + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992)
 + * Sort compactionhistory output by timestamp (CASSANDRA-10464)
 + * More efficient BTree removal (CASSANDRA-9991)
 + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149)
 + * Group pending compactions based on table (CASSANDRA-10718)
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes 
(CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +Merged from 3.0:
   * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
   * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
   * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-28 Thread dbrosius 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: bc6ea03d10ccdb8fd49315900d50264a67ecde8d
Parents: 6bd0f7a 21191e6
Author: Dave Brosius 
Authored: Mon Dec 28 08:25:13 2015 -0500
Committer: Dave Brosius 
Committed: Mon Dec 28 08:25:13 2015 -0500

--
 .../apache/cassandra/thrift/ThriftResultsMerger.java  | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-22 Thread tylerhobbs 
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/e5b6a9c8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5b6a9c8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5b6a9c8

Branch: refs/heads/trunk
Commit: e5b6a9c8b289982c78ff9266db28aa21b28f23ef
Parents: cae3950 796db6e
Author: Tyler Hobbs 
Authored: Tue Dec 22 16:26:24 2015 -0600
Committer: Tyler Hobbs 
Committed: Tue Dec 22 16:26:24 2015 -0600

--
 CHANGES.txt | 1 +
 .../apache/cassandra/cql3/statements/BatchStatement.java| 3 +++
 test/unit/org/apache/cassandra/cql3/BatchTests.java | 9 ++---
 3 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5b6a9c8/CHANGES.txt
--
diff --cc CHANGES.txt
index 9f82731,7794c96..e36e4c2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,5 +1,29 @@@
 -3.0.3
 +3.2
 + * Add forceUserDefinedCleanup to allow more flexible cleanup 
(CASSANDRA-10708)
 + * (cqlsh) allow setting TTL with COPY (CASSANDRA-9494)
 + * Fix EstimatedHistogram creation in nodetool tablehistograms 
(CASSANDRA-10859)
 + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992)
 + * Sort compactionhistory output by timestamp (CASSANDRA-10464)
 + * More efficient BTree removal (CASSANDRA-9991)
 + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149)
 + * Group pending compactions based on table (CASSANDRA-10718)
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes 
(CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +Merged from 3.0:
+  * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
   * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
   * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
   * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5b6a9c8/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-22 Thread tylerhobbs 
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/e1cb9b48
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1cb9b48
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1cb9b48

Branch: refs/heads/trunk
Commit: e1cb9b48fee745e337260ba7bbe264fdde1ada94
Parents: 9a27d3f 270e986
Author: Tyler Hobbs 
Authored: Tue Dec 22 10:47:26 2015 -0600
Committer: Tyler Hobbs 
Committed: Tue Dec 22 10:47:26 2015 -0600

--
 CHANGES.txt |  1 +
 .../db/partitions/PartitionUpdate.java  | 22 
 2 files changed, 23 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1cb9b48/CHANGES.txt
--
diff --cc CHANGES.txt
index 7bbfec6,e83e46e..84e1cb8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,28 @@@
 -3.0.3
 +3.2
 + * (cqlsh) allow setting TTL with COPY (CASSANDRA-9494)
 + * Fix EstimatedHistogram creation in nodetool tablehistograms 
(CASSANDRA-10859)
 + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992)
 + * Sort compactionhistory output by timestamp (CASSANDRA-10464)
 + * More efficient BTree removal (CASSANDRA-9991)
 + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149)
 + * Group pending compactions based on table (CASSANDRA-10718)
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes 
(CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +Merged from 3.0:
+  * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
   * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
   * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)
   * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-22 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 9a27d3fabdff93d7cc764e97be585be1057b0c5d
Parents: 72094a4 f967257
Author: Sylvain Lebresne 
Authored: Tue Dec 22 15:12:46 2015 +0100
Committer: Sylvain Lebresne 
Committed: Tue Dec 22 15:12:46 2015 +0100

--
 bin/cqlsh.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a27d3fa/bin/cqlsh.py
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-21 Thread dbrosius 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: c4428c7dd03b12204b00fd7043d582a6a00982b0
Parents: 53538cb 21103be
Author: Dave Brosius 
Authored: Mon Dec 21 20:29:14 2015 -0500
Committer: Dave Brosius 
Committed: Mon Dec 21 20:29:14 2015 -0500

--
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


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

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-18 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: a0f59dce5bb907dc8f4d08e17ac4e511cf5f81c7
Parents: 50f7e02 d877ba0
Author: Aleksey Yeschenko 
Authored: Fri Dec 18 15:43:52 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Dec 18 15:43:52 2015 +

--
 CHANGES.txt |   1 +
 NOTICE.txt  |   4 -
 build.xml   |   2 -
 lib/jgrapht-core-0.9.1.jar  | Bin 351208 -> 0 bytes
 lib/licenses/jgrapht-core-0.9.1.txt | 227 ---
 src/java/org/apache/cassandra/schema/Types.java |  64 --
 6 files changed, 47 insertions(+), 251 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f59dce/CHANGES.txt
--
diff --cc CHANGES.txt
index d49a75f,e6ab5dd..6bbded8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 -3.0.3
 +3.2
 + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992)
 + * Sort compactionhistory output by timestamp (CASSANDRA-10464)
 + * More efficient BTree removal (CASSANDRA-9991)
 + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149)
 + * Group pending compactions based on table (CASSANDRA-10718)
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes 
(CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +Merged from 3.0:
+  * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
   * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-1837)
   * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
  Merged from 2.2:

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

[2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk

2015-12-17 Thread blerer 
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/50f7e020
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50f7e020
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50f7e020

Branch: refs/heads/trunk
Commit: 50f7e020490ec20608ce2b4321a7fdc3d8943a92
Parents: 37986e8 2da3c9d
Author: blerer 
Authored: Thu Dec 17 12:55:55 2015 +0100
Committer: blerer 
Committed: Thu Dec 17 12:55:55 2015 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/hadoop/cql3/CqlInputFormat.java   | 46 +++---
 .../cassandra/hadoop/cql3/CqlRecordWriter.java  | 63 +++-
 3 files changed, 46 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/50f7e020/CHANGES.txt
--
diff --cc CHANGES.txt
index 4b4a596,a2951a8..d49a75f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 -3.0.3
 +3.2
 + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992)
 + * Sort compactionhistory output by timestamp (CASSANDRA-10464)
 + * More efficient BTree removal (CASSANDRA-9991)
 + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149)
 + * Group pending compactions based on table (CASSANDRA-10718)
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes 
(CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +Merged from 3.0:
+  * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-1837)
   * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
  Merged from 2.2:
   * Add new types to Stress (CASSANDRA-9556)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-15 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 80250aa015adfd17791a78dc23ba1b1067f02104
Parents: bab66dd 98178f5
Author: Aleksey Yeschenko 
Authored: Tue Dec 15 21:51:05 2015 +
Committer: Aleksey Yeschenko 
Committed: Tue Dec 15 21:51:05 2015 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/80250aa0/CHANGES.txt
--
diff --cc CHANGES.txt
index b3dc35b,dd1896c..062ab10
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,10 +1,26 @@@
 -3.0.3
 +3.2
 + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992)
 + * Sort compactionhistory output by timestamp (CASSANDRA-10464)
 + * More efficient BTree removal (CASSANDRA-9991)
 + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149)
 + * Group pending compactions based on table (CASSANDRA-10718)
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes 
(CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
- Merged from 3.0:
-  * Fix upgrade data loss due to range tombstone deleting more data than then 
should
-(CASSANDRA-10822)
- Merged from 2.2
+ Merged from 2.2:
   * 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:
   * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
   * Allow CREATE TABLE WITH ID (CASSANDRA-9179)
@@@ -32,8 -13,12 +29,14 @@@
   * Allow cancellation of index summary redistribution (CASSANDRA-8805)
  
  
 -3.0.2
 - * Fix upgrade data loss due to range tombstone deleting more data than then 
should
 -   (CASSANDRA-10822)
++3.1.1
++Merged from 3.0:
++  * Fix upgrade data loss due to range tombstone deleting more data than then 
should
++(CASSANDRA-10822)
+ 
+ 
 -3.0.1
 +3.1
 +Merged from 3.0:
   * Avoid MV race during node decommission (CASSANDRA-10674)
   * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
   * Handle single-column deletions correction in materialized views

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-14 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 6bc3637260f287a031f2ea8a7e155a6b7692fe92
Parents: 9bfe613 71bac92
Author: Sylvain Lebresne 
Authored: Mon Dec 14 10:58:53 2015 +0100
Committer: Sylvain Lebresne 
Committed: Mon Dec 14 10:58:53 2015 +0100

--
 CHANGES.txt  |  5 -
 .../org/apache/cassandra/db/UnfilteredDeserializer.java  | 11 +--
 .../cassandra/db/compaction/CompactionManager.java   |  5 -
 3 files changed, 13 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bc36372/CHANGES.txt
--
diff --cc CHANGES.txt
index 0ca5277,a0717c6..7d0ca2e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,12 +1,25 @@@
 -3.0.2
 +3.2
 + * Group pending compactions based on table (CASSANDRA-10718)
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes 
(CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
- Merged from 2.2:
++Merged from 3.0:
+  * Fix upgrade data loss due to range tombstone deleting more data than then 
should
+(CASSANDRA-10822)
+ Merged from 2.2
   * 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:
   * Make Stress compiles within eclipse (CASSANDRA-10807)
   * Cassandra Daemon should print JVM arguments (CASSANDRA-10764)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bc36372/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 7a2e71f,2234838..fafab69
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -965,8 -968,7 +968,8 @@@ public class CompactionManager implemen
  expectedBloomFilterSize,
  repairedAt,
  sstable.getSSTableLevel(),
- sstable.header,
+ header,
 +cfs.indexManager.listIndexes(),
  txn);
  }

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-12 Thread dbrosius 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 779817fe71c1d0a891b414df8194d3350089044a
Parents: f7666d5 a8b9e53
Author: Dave Brosius 
Authored: Sat Dec 12 18:20:40 2015 -0500
Committer: Dave Brosius 
Committed: Sat Dec 12 18:20:40 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/779817fe/src/java/org/apache/cassandra/service/StorageProxy.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-06 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 943294ba2914ceefd81f4937e182c484041f26ca
Parents: 8f189d1 9253360
Author: Sylvain Lebresne 
Authored: Fri Nov 6 10:55:03 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 10:55:03 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/943294ba/CHANGES.txt
--
diff --cc CHANGES.txt
index 2c3548a,98c98ab..5352f22
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
   * Fix bootstrapping with MVs (CASSANDRA-10621)
   * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)
   * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/943294ba/src/java/org/apache/cassandra/db/filter/ColumnFilter.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-06 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 9280273f729ac7ee277f1f82de7129ef576de9f8
Parents: 943294b 1e4d44e
Author: Sylvain Lebresne 
Authored: Fri Nov 6 11:54:37 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 11:54:37 2015 +0100

--
 CHANGES.txt |  1 +
 .../db/SinglePartitionReadCommand.java  | 35 +++-
 .../db/filter/ClusteringIndexNamesFilter.java   | 14 ++--
 3 files changed, 47 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9280273f/CHANGES.txt
--
diff --cc CHANGES.txt
index 5352f22,bb8b4d2..8edb976
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Skip sstable on clustering in names query (CASSANDRA-10571)
   * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
   * Fix bootstrapping with MVs (CASSANDRA-10621)
   * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9280273f/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9280273f/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-06 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 2f7bab995480611079c0c318b4d599239d5278cc
Parents: 9280273 dc7e840
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 11:02:23 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 11:02:23 2015 +

--
 .../org/apache/cassandra/cql3/statements/DropTypeStatement.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-06 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 5c97de91bb6d35dceb732a2924f9301f44d7989f
Parents: 2f7bab9 962aa2b
Author: Sylvain Lebresne 
Authored: Fri Nov 6 12:14:14 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 12:14:14 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c97de91/CHANGES.txt
--
diff --cc CHANGES.txt
index 8edb976,6d26afa..6936bf4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix distinct queries in mixed version cluster (CASSANDRA-10573)
   * Skip sstable on clustering in names query (CASSANDRA-10571)
   * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
   * Fix bootstrapping with MVs (CASSANDRA-10621)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c97de91/src/java/org/apache/cassandra/db/ReadCommand.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-06 Thread jake 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: be01d8eb8f5fe5c37cab314938c49edb9f435926
Parents: 735bd65 2998bb3
Author: T Jake Luciani 
Authored: Fri Nov 6 14:33:29 2015 -0500
Committer: T Jake Luciani 
Committed: Fri Nov 6 14:33:29 2015 -0500

--
 CHANGES.txt |  2 +
 .../apache/cassandra/db/view/TemporalRow.java   | 31 +++
 src/java/org/apache/cassandra/db/view/View.java | 24 ---
 .../cassandra/cql3/ViewFilteringTest.java   | 14 +++
 .../org/apache/cassandra/cql3/ViewTest.java | 42 
 5 files changed, 108 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/be01d8eb/CHANGES.txt
--
diff --cc CHANGES.txt
index dc82bd4,3662e6e..88d3fd2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,6 +1,12 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix AssertionError while flushing memtable due to materialized views
+incorrectly inserting empty rows (CASSANDRA-10614)
   * Store UDA initcond as CQL literal in the schema table, instead of a blob 
(CASSANDRA-10650)
   * Don't use -1 for the position of partition key in schema (CASSANDRA-10491)
   * Fix distinct queries in mixed version cluster (CASSANDRA-10573)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/be01d8eb/src/java/org/apache/cassandra/db/view/View.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-06 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 908442878244396c34f03b6f3380ef6b9c9c5cf1
Parents: 1558596 5343a75
Author: Sylvain Lebresne 
Authored: Fri Nov 6 15:03:52 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 6 15:03:52 2015 +0100

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/CFMetaData.java |  3 +-
 .../cassandra/config/ColumnDefinition.java  | 25 ++-
 .../cql3/statements/CreateIndexStatement.java   |  2 +-
 .../apache/cassandra/db/filter/RowFilter.java   | 32 +++-
 .../apache/cassandra/db/view/TemporalRow.java   |  8 +++--
 .../cassandra/schema/LegacySchemaMigrator.java  |  7 +++--
 .../apache/cassandra/schema/SchemaKeyspace.java |  2 +-
 .../cassandra/thrift/ThriftConversion.java  |  4 +--
 .../org/apache/cassandra/db/ColumnsTest.java|  2 +-
 .../schema/LegacySchemaMigratorTest.java|  2 +-
 11 files changed, 43 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90844287/CHANGES.txt
--
diff --cc CHANGES.txt
index 764885a,146ee73..cc21feb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Don't use -1 for the position of partition key in schema (CASSANDRA-10491)
   * Fix distinct queries in mixed version cluster (CASSANDRA-10573)
   * Skip sstable on clustering in names query (CASSANDRA-10571)
   * Remove value skipping as it breaks read-repair (CASSANDRA-10655)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90844287/src/java/org/apache/cassandra/config/CFMetaData.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90844287/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-06 Thread jake 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 12b8c696bfd8ff9b63bd44dbed1fcfe95bc21aab
Parents: be01d8e 96f407b
Author: T Jake Luciani 
Authored: Fri Nov 6 14:39:23 2015 -0500
Committer: T Jake Luciani 
Committed: Fri Nov 6 14:39:23 2015 -0500

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-06 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 155859641af6b5cdbf21fdef279ba62965973b7b
Parents: a177502 0b83c18
Author: Robert Stupp 
Authored: Fri Nov 6 14:56:45 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 6 14:56:45 2015 +0100

--
 .../cql3/validation/entities/UFTest.java| 99 +++-
 1 file changed, 55 insertions(+), 44 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-05 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: c42fcf570904964298c2c0ec9fffab6aa0cc90db
Parents: 2a4b8f1 9940892
Author: Aleksey Yeschenko 
Authored: Thu Nov 5 14:35:34 2015 +
Committer: Aleksey Yeschenko 
Committed: Thu Nov 5 14:35:34 2015 +

--
 bin/cqlsh.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-05 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 65000b3c2d508c6f972022607fb14b27d7d8a11d
Parents: be2cf1a 4a00438
Author: Sylvain Lebresne 
Authored: Thu Nov 5 11:16:05 2015 +0100
Committer: Sylvain Lebresne 
Committed: Thu Nov 5 11:16:05 2015 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/db/UnfilteredDeserializer.java| 45 +++-
 .../columniterator/AbstractSSTableIterator.java |  4 +-
 .../columniterator/SSTableReversedIterator.java | 17 ++--
 4 files changed, 51 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/65000b3c/CHANGES.txt
--
diff --cc CHANGES.txt
index 4fcf4e9,1ff2fdb..14b6007
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix reading of legacy sstables (CASSANDRA-10590)
   * Use CQL type names in schema metadata tables (CASSANDRA-10365)
   * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
   * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-05 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 4effabc8fe842224cd8e2a846274b617d2b4a9e6
Parents: 65000b3 18e2fca
Author: Aleksey Yeschenko 
Authored: Thu Nov 5 11:20:06 2015 +
Committer: Aleksey Yeschenko 
Committed: Thu Nov 5 11:20:06 2015 +

--
 .../org/apache/cassandra/cql3/CQL3Type.java | 22 +---
 .../apache/cassandra/schema/CQLTypeParser.java  |  2 +-
 src/java/org/apache/cassandra/schema/Types.java |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-05 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 2a4b8f10e9fe00dadebaebb9372ff15f7cc8c873
Parents: 4effabc 454f32d
Author: Aleksey Yeschenko 
Authored: Thu Nov 5 13:03:16 2015 +
Committer: Aleksey Yeschenko 
Committed: Thu Nov 5 13:03:16 2015 +

--
 src/java/org/apache/cassandra/schema/Types.java |  2 +-
 .../utils/NativeSSTableLoaderClient.java| 54 +++-
 2 files changed, 42 insertions(+), 14 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-05 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: a38f362a04f5378266e8d466026634962f8d664e
Parents: c42fcf5 5289a56
Author: Robert Stupp 
Authored: Thu Nov 5 18:42:13 2015 +0100
Committer: Robert Stupp 
Committed: Thu Nov 5 18:42:13 2015 +0100

--
 .../org/apache/cassandra/cql3/DeleteTest.java   | 38 ++--
 1 file changed, 11 insertions(+), 27 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-05 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 718c4789c90c25b676f04437b3a31c30b4b460cf
Parents: a38f362 9c9f263
Author: Aleksey Yeschenko 
Authored: Thu Nov 5 22:32:34 2015 +
Committer: Aleksey Yeschenko 
Committed: Thu Nov 5 22:32:34 2015 +

--
 CHANGES.txt |  1 +
 .../cassandra/hadoop/cql3/CqlInputFormat.java   | 22 ++--
 2 files changed, 17 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/718c4789/CHANGES.txt
--
diff --cc CHANGES.txt
index 14b6007,b469594..72dc800
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * (Hadoop) fix CIF describeSplits() not handling 0 size estimates 
(CASSANDRA-10600)
   * Fix reading of legacy sstables (CASSANDRA-10590)
   * Use CQL type names in schema metadata tables (CASSANDRA-10365)
   * Guard batchlog replay against integer division by zero (CASSANDRA-9223)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-05 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: bc674c1c88064329790f498f8a53a2eb9905c3ae
Parents: c3678f6 1bd2c94
Author: Aleksey Yeschenko 
Authored: Thu Nov 5 23:04:53 2015 +
Committer: Aleksey Yeschenko 
Committed: Thu Nov 5 23:04:53 2015 +

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/view/ViewUtils.java | 31 
 2 files changed, 19 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc674c1c/CHANGES.txt
--
diff --cc CHANGES.txt
index 72dc800,ce24c2b..311a07d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)
   * (Hadoop) fix CIF describeSplits() not handling 0 size estimates 
(CASSANDRA-10600)
   * Fix reading of legacy sstables (CASSANDRA-10590)
   * Use CQL type names in schema metadata tables (CASSANDRA-10365)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-05 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: d128103b3dbdf2c225170084b117a7e76c708a5f
Parents: bc674c1 f3eb4ce
Author: Aleksey Yeschenko 
Authored: Thu Nov 5 23:22:34 2015 +
Committer: Aleksey Yeschenko 
Committed: Thu Nov 5 23:22:34 2015 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d128103b/CHANGES.txt
--
diff --cc CHANGES.txt
index 311a07d,1dd1ed2..d641314
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)
   * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)
   * (Hadoop) fix CIF describeSplits() not handling 0 size estimates 
(CASSANDRA-10600)
   * Fix reading of legacy sstables (CASSANDRA-10590)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-05 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: e8e90406f8d8597d390f142d9a457158c5b1b6fb
Parents: 718c478 4db577a
Author: Aleksey Yeschenko 
Authored: Thu Nov 5 22:52:39 2015 +
Committer: Aleksey Yeschenko 
Committed: Thu Nov 5 22:52:39 2015 +

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

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-05 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 746e9e4196a87596d3a0a3e2775edf6cf45f0d8d
Parents: d128103 02a53fa
Author: Aleksey Yeschenko 
Authored: Thu Nov 5 23:46:42 2015 +
Committer: Aleksey Yeschenko 
Committed: Thu Nov 5 23:46:42 2015 +

--
 CHANGES.txt   |  1 +
 src/java/org/apache/cassandra/service/StorageProxy.java   |  2 +-
 src/java/org/apache/cassandra/service/StorageService.java | 10 ++
 3 files changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/746e9e41/CHANGES.txt
--
diff --cc CHANGES.txt
index d641314,6873edd..0dbc3a8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix bootstrapping with MVs (CASSANDRA-10621)
   * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)
   * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)
   * (Hadoop) fix CIF describeSplits() not handling 0 size estimates 
(CASSANDRA-10600)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/746e9e41/src/java/org/apache/cassandra/service/StorageProxy.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-04 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 81e1b15dbd25b6ef8d23ff3b4aba573f4e9efd1a
Parents: b14423c 1492be0
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 13:13:32 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 13:13:32 2015 +

--
 CHANGES.txt |  1 +
 .../cassandra/batchlog/BatchlogManager.java |  8 +++-
 .../cassandra/batchlog/BatchlogManagerTest.java | 40 
 3 files changed, 48 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/81e1b15d/CHANGES.txt
--
diff --cc CHANGES.txt
index 6b5984b,61cc92e..1ae41a0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
   * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)
   * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
   * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-04 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 67ffe366ad89e69efaa2755e32d9a0321828a6b1
Parents: fda0754 1f1700a
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 15:47:45 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 15:47:45 2015 +

--
 bin/cqlsh.py | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-04 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: fd6e27a432a710628609b00d7d23f661c6483475
Parents: 67ffe36 f4af154
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 16:32:16 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 16:32:16 2015 +

--
 ...driver-internal-only-3.0.0a2.post0-b9dfda5.zip | Bin 230861 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-04 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 5a1d6553e64592f046fb1d01756c75fea8c1d777
Parents: 724ba07 2c99761
Author: Sylvain Lebresne 
Authored: Wed Nov 4 11:40:56 2015 +0100
Committer: Sylvain Lebresne 
Committed: Wed Nov 4 11:40:56 2015 +0100

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/LegacyLayout.java   |  7 +-
 .../apache/cassandra/db/LegacyCellNameTest.java | 81 
 3 files changed, 87 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a1d6553/CHANGES.txt
--
diff --cc CHANGES.txt
index b0aad8c,e9f92c6..1d6a84c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)
   * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
   * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
   * Don't use 'names query' read path for counters (CASSANDRA-10572)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-04 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: b40527fcc79e9cc327863edbc70338e2537b1392
Parents: 5a1d655 c0c9555
Author: Sylvain Lebresne 
Authored: Wed Nov 4 11:49:22 2015 +0100
Committer: Sylvain Lebresne 
Committed: Wed Nov 4 11:49:22 2015 +0100

--
 .../org/apache/cassandra/db/NativeCellTest.java | 271 ---
 1 file changed, 271 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-03 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 468a4c58c7bd47b7e40ed5b085a95bcdfec1e522
Parents: 663cd43 0ad0de1
Author: Sylvain Lebresne 
Authored: Tue Nov 3 09:35:11 2015 +0100
Committer: Sylvain Lebresne 
Committed: Tue Nov 3 09:35:11 2015 +0100

--
 CHANGES.txt |  1 -
 .../db/SinglePartitionReadCommand.java  | 22 
 .../db/filter/ClusteringIndexNamesFilter.java   | 14 ++---
 3 files changed, 2 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/468a4c58/CHANGES.txt
--
diff --cc CHANGES.txt
index c412bb3,1724f01..37f7aa4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,4 +1,10 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
-  * Skip sstables by clustering in query by names path (10571)
   * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
   * Don't use 'names query' read path for counters (CASSANDRA-10572)
   * Fix backward compatibility for counters (CASSANDRA-10470)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/468a4c58/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/468a4c58/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-02 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 9c9e39263d50b789f59855d7a7b55397c5820a4d
Parents: 40d1425 1e8007b
Author: Sylvain Lebresne 
Authored: Mon Nov 2 15:35:59 2015 +0100
Committer: Sylvain Lebresne 
Committed: Mon Nov 2 15:35:59 2015 +0100

--
 CHANGES.txt |  1 +
 .../db/SinglePartitionReadCommand.java  | 22 
 .../db/filter/ClusteringIndexNamesFilter.java   | 14 +++--
 3 files changed, 35 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c9e3926/CHANGES.txt
--
diff --cc CHANGES.txt
index 37f7aa4,080cc51..c412bb3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Skip sstables by clustering in query by names path (10571)
   * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
   * Don't use 'names query' read path for counters (CASSANDRA-10572)
   * Fix backward compatibility for counters (CASSANDRA-10470)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c9e3926/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c9e3926/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-02 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 40d1425a155a3b5cd8d5a7cd98900283ed5be143
Parents: b1f2d14 cba5ef6
Author: Sylvain Lebresne 
Authored: Mon Nov 2 15:29:15 2015 +0100
Committer: Sylvain Lebresne 
Committed: Mon Nov 2 15:29:15 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/40d1425a/CHANGES.txt
--
diff --cc CHANGES.txt
index 3b33f5d,1724f01..37f7aa4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
   * Don't use 'names query' read path for counters (CASSANDRA-10572)
   * Fix backward compatibility for counters (CASSANDRA-10470)
   * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-30 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: e3945487331359a91c49d34015b52f79e5b30b1c
Parents: b19ece1 df7c658
Author: Sylvain Lebresne 
Authored: Fri Oct 30 14:42:35 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Oct 30 14:42:35 2015 +0100

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/LegacyLayout.java   | 28 +---
 .../cassandra/db/context/CounterContext.java| 16 +++
 3 files changed, 35 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3945487/CHANGES.txt
--
diff --cc CHANGES.txt
index 4106b64,72f48f5..71330e1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix backward compatibility for counters (CASSANDRA-10470)
   * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581)
   * Execute the metadata reload task of all registered indexes on CFS::reload 
(CASSANDRA-10604)
   * Fix thrift cas operations with defined columns (CASSANDRA-10576)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-28 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 9be01e34c8adaa9558458e864969d22b05cb8e87
Parents: 30d5b65 4d00468
Author: Sylvain Lebresne 
Authored: Wed Oct 28 16:14:10 2015 +0100
Committer: Sylvain Lebresne 
Committed: Wed Oct 28 16:14:10 2015 +0100

--
 CHANGES.txt|  1 +
 .../apache/cassandra/thrift/CassandraServer.java   | 17 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9be01e34/CHANGES.txt
--
diff --cc CHANGES.txt
index 5f3abbe,3423a1e..04cefae
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix thrift get() queries with defined columns (CASSANDRA-10586)
   * Fix marking of indexes as built and removed (CASSANDRA-10601)
   * Skip initialization of non-registered 2i instances, remove 
Index::getIndexName (CASSANDRA-10595)
   * Fix batches on multiple tables (CASSANDRA-10554)

[2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk

2015-10-28 Thread blerer 
Merge branch cassandra-3.0 into trunk


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

Branch: refs/heads/trunk
Commit: a4fe865d4f8cb7ca8d14191d6d9ccf6ac1f79eb3
Parents: 9be01e3 3615da5
Author: Benjamin Lerer 
Authored: Wed Oct 28 17:47:07 2015 +0100
Committer: Benjamin Lerer 
Committed: Wed Oct 28 17:47:33 2015 +0100

--
 CHANGES.txt |  1 +
 .../db/partitions/PartitionUpdate.java  |  1 +
 .../db/partition/PartitionUpdateTest.java   | 67 
 3 files changed, 69 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4fe865d/CHANGES.txt
--
diff --cc CHANGES.txt
index 04cefae,c51cb51..29117e0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix PartitionUpdate.operationCount()for updates with static column 
operations (CASSANDRA-10606)
   * Fix thrift get() queries with defined columns (CASSANDRA-10586)
   * Fix marking of indexes as built and removed (CASSANDRA-10601)
   * Skip initialization of non-registered 2i instances, remove 
Index::getIndexName (CASSANDRA-10595)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-27 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: d3617a347dfbdaef80ed6fad39d3034f10bcf397
Parents: 04b2528 f901a74
Author: Sylvain Lebresne 
Authored: Tue Oct 27 13:55:21 2015 +0100
Committer: Sylvain Lebresne 
Committed: Tue Oct 27 13:55:21 2015 +0100

--
 CHANGES.txt |  1 +
 .../cql3/statements/BatchStatement.java | 35 ++--
 .../cql3/statements/ModificationStatement.java  |  2 +-
 .../cql3/statements/UpdatesCollector.java   | 10 +++---
 .../cql3/validation/operations/BatchTest.java   | 25 ++
 5 files changed, 65 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3617a34/CHANGES.txt
--
diff --cc CHANGES.txt
index c83a79c,f8dffb0..c781166
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix batches on multiple tables (CASSANDRA-10554)
   * Ensure compaction options are validated when updating KeyspaceMetadata 
(CASSANDRA-10569)
   * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
   * Remove token generator (CASSANDRA-5261)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3617a34/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-26 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 4f62eb953cf4eedee82e387b614955fca50b1770
Parents: 3a2dd0c 9b727ac
Author: Robert Stupp 
Authored: Mon Oct 26 10:03:28 2015 +0100
Committer: Robert Stupp 
Committed: Mon Oct 26 10:03:28 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f62eb95/CHANGES.txt
--
diff --cc CHANGES.txt
index dae9264,f737a2b..2c4a145
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * RolesCache should not be created for any authenticator that does not 
requireAuthentication (CASSANDRA-10562)
   * Fix LogTransaction checking only a single directory for files 
(CASSANDRA-10421)
   * Support encrypted and plain traffic on the same port (CASSANDRA-10559)
   * Fix handling of range tombstones when reading old format sstables 
(CASSANDRA-10360)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-26 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 6f848db4c071d89b6ee8ba54beded4274fe5347b
Parents: f91aad4 db7feb4
Author: Robert Stupp 
Authored: Mon Oct 26 13:39:38 2015 +0100
Committer: Robert Stupp 
Committed: Mon Oct 26 13:39:38 2015 +0100

--
 CHANGES.txt   |   1 +
 NEWS.txt  |   1 +
 tools/bin/token-generator | 356 -
 tools/bin/token-generator.bat |  34 
 4 files changed, 2 insertions(+), 390 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f848db4/CHANGES.txt
--
diff --cc CHANGES.txt
index 2c4a145,0457917..02f6584
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Remove token generator (CASSANDRA-5261)
   * RolesCache should not be created for any authenticator that does not 
requireAuthentication (CASSANDRA-10562)
   * Fix LogTransaction checking only a single directory for files 
(CASSANDRA-10421)
   * Support encrypted and plain traffic on the same port (CASSANDRA-10559)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-23 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 71d9dba063b0e669f12afef9fbb3efcb9cfacdd3
Parents: e43fbe0 535c3ac
Author: Robert Stupp 
Authored: Fri Oct 23 14:44:32 2015 +0200
Committer: Robert Stupp 
Committed: Fri Oct 23 14:44:32 2015 +0200

--
 CHANGES.txt |  1 +
 conf/cassandra.yaml |  2 +
 .../cassandra/config/EncryptionOptions.java |  1 +
 .../org/apache/cassandra/transport/Server.java  | 75 ++--
 .../service/NativeTransportServiceTest.java | 18 +
 5 files changed, 90 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/71d9dba0/CHANGES.txt
--
diff --cc CHANGES.txt
index 789a9d7,67e06ca..2ecad90
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Support encrypted and plain traffic on the same port (CASSANDRA-10559)
   * Fix handling of range tombstones when reading old format sstables 
(CASSANDRA-10360)
   * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
  Merged from 2.2:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-21 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 1b386c5d5975922b7c439e5153d63e83e98fa2ec
Parents: 05eb602 1fe594d
Author: Sylvain Lebresne 
Authored: Wed Oct 21 15:46:19 2015 +0200
Committer: Sylvain Lebresne 
Committed: Wed Oct 21 15:46:19 2015 +0200

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/db/LegacyLayout.java   |  50 --
 .../cassandra/db/UnfilteredDeserializer.java| 468 ++-
 .../columniterator/AbstractSSTableIterator.java |   4 +-
 .../columniterator/SSTableReversedIterator.java |  18 +-
 5 files changed, 361 insertions(+), 180 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b386c5d/CHANGES.txt
--
diff --cc CHANGES.txt
index 36b95f4,0529dd8..ac98481
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix handling of range tombstones when reading old format sstables 
(CASSANDRA-10360)
   * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
  Merged from 2.2:
   * Expose phi values from failure detector via JMX and tweak debug

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-20 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: f8fa3a42712e0f8498180b062c421426189e3ddc
Parents: 881e2da 615945d
Author: Robert Stupp 
Authored: Tue Oct 20 17:45:43 2015 +0200
Committer: Robert Stupp 
Committed: Tue Oct 20 17:45:43 2015 +0200

--
 CHANGES.txt |   1 +
 ...ore-3.0.0-alpha3-093a692-SNAPSHOT-shaded.jar | Bin 2281177 -> 0 bytes
 ...assandra-driver-core-3.0.0-alpha4-shaded.jar | Bin 0 -> 2275541 bytes
 .../cassandra/cql3/functions/UDFunction.java|   4 +--
 .../cassandra/cql3/functions/UDHelper.java  |  15 +++
 .../validation/operations/AggregationTest.java  |  26 +++
 6 files changed, 39 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8fa3a42/CHANGES.txt
--
diff --cc CHANGES.txt
index 5cd268b,6c97ffb..88c439e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
  Merged from 2.2:
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-16 Thread jake 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 3c4a3bcd8c41c2a0435e82252a83c5018ed99645
Parents: 841e485 56a06d7
Author: T Jake Luciani 
Authored: Fri Oct 16 16:08:06 2015 -0400
Committer: T Jake Luciani 
Committed: Fri Oct 16 16:08:06 2015 -0400

--

--

[2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk

2015-10-16 Thread blerer 
Merge branch cassandra-3.0 into trunk


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

Branch: refs/heads/trunk
Commit: 841e4854661354d32bd94762a72d292fc1553866
Parents: dec7659 5d6455f
Author: blerer 
Authored: Fri Oct 16 21:42:04 2015 +0200
Committer: blerer 
Committed: Fri Oct 16 21:42:14 2015 +0200

--
 CHANGES.txt   | 1 +
 NEWS.txt  | 2 +-
 src/java/org/apache/cassandra/db/ReadCommand.java | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/841e4854/CHANGES.txt
--
diff --cc CHANGES.txt
index 801b2fb,33c360e..725cc9f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0-rc2
+  * Fix SELECT DISTINCT queries between 2.2.2 nodes and 3.0 nodes 
(CASSANDRA-10473)
   * Remove circular references in SegmentedFile (CASSANDRA-10543)
   * Ensure validation of indexed values only occurs once per-partition 
(CASSANDRA-10536)
   * Fix handling of static columns for range tombstones in thrift 
(CASSANDRA-10174)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/841e4854/src/java/org/apache/cassandra/db/ReadCommand.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-16 Thread marcuse 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: c20f6b374bc93e08cc5e6a65784e25185e386d9d
Parents: 6ef817a e1fb18a
Author: Marcus Eriksson 
Authored: Fri Oct 16 12:31:24 2015 +0200
Committer: Marcus Eriksson 
Committed: Fri Oct 16 12:31:24 2015 +0200

--
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 12 
 .../db/compaction/AbstractCompactionStrategy.java   |  6 +-
 2 files changed, 13 insertions(+), 5 deletions(-)
--


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

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-16 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 4034dc904ed7e909a3346e55cacc90f58791bbda
Parents: 737a338 d413ddf
Author: Sylvain Lebresne 
Authored: Fri Oct 16 14:58:21 2015 +0200
Committer: Sylvain Lebresne 
Committed: Fri Oct 16 14:58:21 2015 +0200

--
 .../org/apache/cassandra/db/rows/BTreeRow.java  |   7 +-
 .../org/apache/cassandra/db/rows/RowsTest.java  | 131 ++-
 2 files changed, 133 insertions(+), 5 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-16 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 1bcf0c7b671d53688c634ed00700510ad63b322e
Parents: 4034dc9 e0ce1dd
Author: Sylvain Lebresne 
Authored: Fri Oct 16 15:54:21 2015 +0200
Committer: Sylvain Lebresne 
Committed: Fri Oct 16 15:54:21 2015 +0200

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/db/LegacyLayout.java   | 135 ++-
 2 files changed, 104 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bcf0c7b/CHANGES.txt
--
diff --cc CHANGES.txt
index eb59885,e2d9dd7..e98de55
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0-rc2
+  * Fix handling of static columns for range tombstones in thrift 
(CASSANDRA-10174)
   * Support empty ColumnFilter for backward compatility on empty IN 
(CASSANDRA-10471)
   * Remove Pig support (CASSANDRA-10542)
   * Fix LogFile throws Exception when assertion is disabled (CASSANDRA-10522)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-14 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: f02e13a86964e6d95a8427bc42e2279612848be7
Parents: 42f7611 cc2478d
Author: Aleksey Yeschenko 
Authored: Wed Oct 14 16:19:10 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Wed Oct 14 16:19:10 2015 +0100

--
 CHANGES.txt |  1 +
 NEWS.txt|  1 +
 .../apache/cassandra/db/ConsistencyLevel.java   | 40 ++--
 .../exceptions/UnavailableException.java|  5 +++
 4 files changed, 44 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f02e13a8/CHANGES.txt
--
diff --cc CHANGES.txt
index 6eb5a31,6b7b4eb..aff533f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0-rc2
+  * Allow EACH_QUORUM for reads (CASSANDRA-9602)
   * Fix potential ClassCastException while upgrading (CASSANDRA-10468)
   * Fix NPE in MVs on update (CASSANDRA-10503)
   * Only include modified cell data in indexing deltas (CASSANDRA-10438)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-14 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 1b23b2a1ca6cc77c93ac6f79fe35e53f65d02fe2
Parents: f08d611 0556fbf
Author: Aleksey Yeschenko 
Authored: Wed Oct 14 16:49:16 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Wed Oct 14 16:49:16 2015 +0100

--
 CHANGES.txt|  1 +
 test/unit/org/apache/cassandra/TeeingAppender.java | 14 ++
 2 files changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b23b2a1/CHANGES.txt
--
diff --cc CHANGES.txt
index 1330424,49a3c57..c760e61
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0-rc2
+  * Fix TeeingAppender causing some logs to be truncated/empty 
(CASSANDRA-10447)
   * Allow EACH_QUORUM for reads (CASSANDRA-9602)
   * Fix potential ClassCastException while upgrading (CASSANDRA-10468)
   * Fix NPE in MVs on update (CASSANDRA-10503)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-14 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: d16892a7dfe863a15500fc29db8333da1a8f6a34
Parents: 1ad9914 26c8892
Author: Sylvain Lebresne 
Authored: Wed Oct 14 11:56:13 2015 +0200
Committer: Sylvain Lebresne 
Committed: Wed Oct 14 11:56:13 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d16892a7/CHANGES.txt
--
diff --cc CHANGES.txt
index 59cd12a,84b85cf..e8ffa0f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0-rc2
+  * Fix potential ClassCastException while upgrading (CASSANDRA-10468)
   * Fix NPE in MVs on update (CASSANDRA-10503)
   * Only include modified cell data in indexing deltas (CASSANDRA-10438)
   * Do not load keyspace when creating sstable writer (CASSANDRA-10443)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-13 Thread slebresne 
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/8644338f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8644338f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8644338f

Branch: refs/heads/trunk
Commit: 8644338fc8b84a943b9ae78c05b9bb862f107b2d
Parents: 3bcdc4b dc61fa6
Author: Sylvain Lebresne 
Authored: Tue Oct 13 11:04:28 2015 +0200
Committer: Sylvain Lebresne 
Committed: Tue Oct 13 11:04:28 2015 +0200

--
 CHANGES.txt |  3 +-
 src/java/org/apache/cassandra/db/view/View.java |  6 +++-
 .../apache/cassandra/db/view/ViewManager.java   | 22 ++--
 .../org/apache/cassandra/cql3/ViewTest.java | 35 
 4 files changed, 54 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8644338f/CHANGES.txt
--
diff --cc CHANGES.txt
index cdcc2eb,3b63714..59cd12a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
- 3.0
+ 3.0-rc2
+  * Fix NPE in MVs on update (CASSANDRA-10503)
   * Only include modified cell data in indexing deltas (CASSANDRA-10438)
   * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
   * If node is not yet gossiping write all MV updates to batchlog only 
(CASSANDRA-10413)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8644338f/src/java/org/apache/cassandra/db/view/View.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-12 Thread marcuse 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 16f29aac9f43a126573cfa22e99a78348c4207ea
Parents: 739de13 50fae5d
Author: Marcus Eriksson 
Authored: Mon Oct 12 08:28:35 2015 +0200
Committer: Marcus Eriksson 
Committed: Mon Oct 12 08:28:35 2015 +0200

--
 src/java/org/apache/cassandra/db/SystemKeyspace.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-09 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: e8d8941cc8343312ee1deb7f71ef038572c043cb
Parents: f8358b8 6584331
Author: Sylvain Lebresne 
Authored: Fri Oct 9 18:07:18 2015 +0200
Committer: Sylvain Lebresne 
Committed: Fri Oct 9 18:07:18 2015 +0200

--
 .../org/apache/cassandra/db/ColumnIndex.java|  10 +-
 src/java/org/apache/cassandra/db/Memtable.java  |   2 +-
 .../cassandra/db/SerializationHeader.java   |  26 ++-
 .../cassandra/db/UnfilteredDeserializer.java|   8 +-
 .../rows/UnfilteredRowIteratorSerializer.java   |  10 +-
 .../cassandra/db/rows/UnfilteredSerializer.java | 174 +++
 .../io/sstable/AbstractSSTableSimpleWriter.java |   2 +-
 .../io/sstable/SSTableSimpleUnsortedWriter.java |   4 +-
 .../apache/cassandra/db/RowIndexEntryTest.java  |   4 +-
 .../unit/org/apache/cassandra/db/ScrubTest.java |   3 +-
 .../db/compaction/AntiCompactionTest.java   |   2 +-
 .../io/sstable/BigTableWriterTest.java  |   2 +-
 .../io/sstable/SSTableRewriterTest.java |   4 +-
 .../cassandra/io/sstable/SSTableUtils.java  |   2 +-
 14 files changed, 155 insertions(+), 98 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-08 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 9515fca7692ed09aa0b3c6c12f038d6a459d87de
Parents: 7a7fb8e d76d3a5
Author: Sylvain Lebresne 
Authored: Thu Oct 8 12:07:04 2015 +0200
Committer: Sylvain Lebresne 
Committed: Thu Oct 8 12:07:04 2015 +0200

--
 .../org/apache/cassandra/config/CFMetaData.java |  2 +-
 .../cql3/statements/AlterTableStatement.java| 99 +++-
 .../org/apache/cassandra/cql3/ViewTest.java | 76 +++
 .../cql3/validation/operations/AlterTest.java   | 14 +++
 4 files changed, 148 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9515fca7/src/java/org/apache/cassandra/config/CFMetaData.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-08 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: f5b3962a7893e6627f81fd4b1fe845a5950094ac
Parents: 9515fca e1eed52
Author: Robert Stupp 
Authored: Thu Oct 8 20:45:50 2015 +0200
Committer: Robert Stupp 
Committed: Thu Oct 8 20:45:50 2015 +0200

--
 .../cassandra/cql3/functions/UDAggregate.java   |  12 +-
 .../cassandra/schema/LegacySchemaMigrator.java  |  20 ++-
 .../apache/cassandra/schema/SchemaKeyspace.java |  18 +-
 .../schema/LegacySchemaMigratorTest.java| 163 ++-
 4 files changed, 188 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5b3962a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-07 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 07782aa4a525e251cb0f8ac6f6d27145066cf0ea
Parents: 587fe51 566799f
Author: Sylvain Lebresne 
Authored: Wed Oct 7 10:48:48 2015 +0200
Committer: Sylvain Lebresne 
Committed: Wed Oct 7 10:48:48 2015 +0200

--
 NEWS.txt | 2 ++
 conf/cassandra.yaml  | 1 -
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 ++-
 test/conf/cassandra_pig.yaml | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/07782aa4/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-07 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: aebdef875b77b4f254b0808da1f63baef0342327
Parents: 9a27835 22099ad
Author: Sylvain Lebresne 
Authored: Wed Oct 7 10:26:55 2015 +0200
Committer: Sylvain Lebresne 
Committed: Wed Oct 7 10:26:55 2015 +0200

--
 bin/cqlsh.py | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-07 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 587fe51b1abb73ce0847d75dedd465a1214492a2
Parents: 557bbbc 15334f4
Author: Sylvain Lebresne 
Authored: Wed Oct 7 10:43:38 2015 +0200
Committer: Sylvain Lebresne 
Committed: Wed Oct 7 10:43:38 2015 +0200

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 
 2 files changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/587fe51b/CHANGES.txt
--
diff --cc CHANGES.txt
index 725da54,ba0012e..518d722
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
   * Provide additional metrics for materialized views (CASSANDRA-10323)
   * Flush system schema tables after local schema changes (CASSANDRA-10429)
  Merged from 2.2:

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

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-07 Thread jake 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: dc6f5bdb0aa530b705873dca42a7c59bf95c96d6
Parents: 127f7c5 6c3fa8e
Author: T Jake Luciani 
Authored: Wed Oct 7 15:48:05 2015 -0400
Committer: T Jake Luciani 
Committed: Wed Oct 7 15:48:05 2015 -0400

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/view/ViewUtils.java |  2 +-
 .../apache/cassandra/service/StorageProxy.java  | 91 +++-
 3 files changed, 52 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc6f5bdb/CHANGES.txt
--
diff --cc CHANGES.txt
index 518d722,0bac64e..16958a1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.2
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * If node is not yet gossiping write all MV updates to batchlog only 
(CASSANDRA-10413)
   * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
   * Provide additional metrics for materialized views (CASSANDRA-10323)
   * Flush system schema tables after local schema changes (CASSANDRA-10429)

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

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-07 Thread marcuse 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: c2bc39f289794b6803fa8c89c91da857a37436bd
Parents: 07782aa 36d0f55
Author: Marcus Eriksson 
Authored: Wed Oct 7 13:57:28 2015 +0200
Committer: Marcus Eriksson 
Committed: Wed Oct 7 13:57:28 2015 +0200

--
 conf/cassandra.yaml  | 2 +-
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 4 ++--
 src/java/org/apache/cassandra/dht/BootStrapper.java  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2bc39f2/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-02 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 368c141b0fa7360f6adacb47e1aa11b425844b2a
Parents: 2d991a7 62ffa35
Author: Sylvain Lebresne 
Authored: Fri Oct 2 17:10:49 2015 +0200
Committer: Sylvain Lebresne 
Committed: Fri Oct 2 17:10:49 2015 +0200

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/db/Keyspace.java  | 27 +++---
 src/java/org/apache/cassandra/db/Mutation.java  |  6 ++-
 src/java/org/apache/cassandra/db/view/View.java |  3 ++
 .../apache/cassandra/db/view/ViewBuilder.java   |  4 +-
 .../apache/cassandra/db/view/ViewManager.java   | 19 ++-
 .../cassandra/metrics/KeyspaceMetrics.java  |  8 ++-
 .../apache/cassandra/metrics/TableMetrics.java  | 57 ++--
 .../cassandra/metrics/ViewWriteMetrics.java | 18 ++-
 .../apache/cassandra/service/StorageProxy.java  | 22 +---
 10 files changed, 128 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/368c141b/CHANGES.txt
--
diff --cc CHANGES.txt
index efb1efe,5bf70ca..95a940b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Provide additional metrics for materialized views (CASSANDRA-10323)
   * Flush system schema tables after local schema changes (CASSANDRA-10429)
  Merged from 2.2:
   * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-02 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 9a278359060aa2c5bf4099fb36a40506245d3f57
Parents: 602be35 2084f3f
Author: Aleksey Yeschenko 
Authored: Fri Oct 2 14:46:40 2015 -0700
Committer: Aleksey Yeschenko 
Committed: Fri Oct 2 14:46:40 2015 -0700

--
 conf/cassandra.yaml | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-01 Thread marcuse 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 3701170502f7f67230ebfd70a8e4cb3c3612f129
Parents: f1e4502 4bb56c4
Author: Marcus Eriksson 
Authored: Thu Oct 1 15:35:58 2015 +0200
Committer: Marcus Eriksson 
Committed: Thu Oct 1 15:35:58 2015 +0200

--
 .../cassandra/db/partitions/PurgingPartitionIterator.java   | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-01 Thread tylerhobbs 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: c3be5ab022972cfe9465151828134075f75794dd
Parents: 2d2f55f 5c2912d
Author: Tyler Hobbs 
Authored: Thu Oct 1 14:26:42 2015 -0500
Committer: Tyler Hobbs 
Committed: Thu Oct 1 14:26:42 2015 -0500

--
 CHANGES.txt   |  1 +
 build.xml |  3 +++
 .../apache/cassandra/db/DefinitionsUpdateVerbHandler.java |  2 +-
 src/java/org/apache/cassandra/schema/SchemaKeyspace.java  | 10 ++
 .../org/apache/cassandra/service/MigrationManager.java|  4 ++--
 src/java/org/apache/cassandra/service/MigrationTask.java  |  2 +-
 .../org/apache/cassandra/schema/SchemaKeyspaceTest.java   |  4 ++--
 7 files changed, 16 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3be5ab0/CHANGES.txt
--
diff --cc CHANGES.txt
index 2df7d8c,5fddce9..efb1efe
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Flush system schema tables after local schema changes (CASSANDRA-10429)
  Merged from 2.2:
   * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-30 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 247bc2e67ef6f6dee870b876d6c470073835c8c6
Parents: ed65ff9 3ae01dd
Author: Robert Stupp 
Authored: Wed Sep 30 13:25:13 2015 +0200
Committer: Robert Stupp 
Committed: Wed Sep 30 13:25:13 2015 +0200

--
 .../cql3/functions/JavaBasedUDFunction.java |   2 +-
 .../cql3/functions/ScriptBasedUDFunction.java   |   4 +-
 .../cql3/functions/SecurityThreadGroup.java |  19 ++-
 .../functions/ThreadAwareSecurityManager.java   |  57 +---
 .../cassandra/cql3/functions/UDFunction.java|  12 +-
 .../validation/entities/UFPureScriptTest.java   |  99 -
 .../UFPureScriptTupleCollectionTest.java| 138 +++
 7 files changed, 207 insertions(+), 124 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-24 Thread jmckenzie 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 52a10696aeb88bf055ff1800ab6a557598bac7a5
Parents: a2b1b8a 2e87c43
Author: Joshua McKenzie 
Authored: Thu Sep 24 09:44:04 2015 -0700
Committer: Joshua McKenzie 
Committed: Thu Sep 24 09:44:04 2015 -0700

--
 pylib/cqlshlib/helptopics.py | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)
--

[2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk

2015-09-22 Thread blerer 
Merge branch cassandra-3.0 into trunk


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

Branch: refs/heads/trunk
Commit: 56d81ac53b25998d614537b25dd936af4721d250
Parents: b283eac 96eb58a
Author: blerer 
Authored: Tue Sep 22 20:52:00 2015 +0200
Committer: blerer 
Committed: Tue Sep 22 20:53:18 2015 +0200

--
 NEWS.txt | 3 +++
 .../cassandra/cql3/validation/operations/AggregationTest.java| 4 
 2 files changed, 7 insertions(+)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-19 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: bf5dd032fc7428cf3532a2d684ba07bd563435d4
Parents: 4bb5976 aba97fc
Author: Aleksey Yeschenko 
Authored: Sat Sep 19 19:17:53 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Sat Sep 19 19:17:53 2015 +0100

--
 CHANGES.txt   | 2 ++
 src/java/org/apache/cassandra/db/ReadCommand.java | 6 ++
 2 files changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf5dd032/CHANGES.txt
--
diff --cc CHANGES.txt
index bd51c80,851a19b..119870d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,6 +1,10 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-rc1
+  * Fix mixed version read request compatibility for compact static tables
+(CASSANDRA-10373)
   * Fix paging of DISTINCT with static and IN (CASSANDRA-10354)
   * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
 columns (CASSANDRA-9664)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-19 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 92b813165484a67069fbd233c8ed1eac7a8a4fe1
Parents: 1e669e5 6af4657
Author: Aleksey Yeschenko 
Authored: Sat Sep 19 16:30:48 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Sat Sep 19 16:30:48 2015 +0100

--
 ...core-3.0.0-alpha3-093a692-SNAPSHOT-shaded.jar | Bin 0 -> 2281177 bytes
 ...core-3.0.0-alpha3-f9b7e7c-SNAPSHOT-shaded.jar | Bin 2282233 -> 0 bytes
 ...river-internal-only-3.0.0a2.post0-379b6f2.zip | Bin 230837 -> 0 bytes
 ...river-internal-only-3.0.0a2.post0-b9dfda5.zip | Bin 0 -> 230861 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-19 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 1e669e5629950df7156cfd482a2c702d804e5ee9
Parents: e44e21c 91e2501
Author: Aleksey Yeschenko 
Authored: Sat Sep 19 16:12:02 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Sat Sep 19 16:12:02 2015 +0100

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/db/filter/DataLimits.java| 3 +++
 .../apache/cassandra/service/pager/MultiPartitionPager.java| 6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e669e56/CHANGES.txt
--
diff --cc CHANGES.txt
index 7e7a6c3,45fa773..bd51c80
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-rc1
+  * Fix paging of DISTINCT with static and IN (CASSANDRA-10354)
   * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
 columns (CASSANDRA-9664)
   * Move crc_check_chance out of compression options (CASSANDRA-9839)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-19 Thread jake 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: b283eac1578f6cc09d77bdb4963f08a50d57c2e6
Parents: 600e1aa c95a709
Author: T Jake Luciani 
Authored: Sat Sep 19 16:04:04 2015 -0400
Committer: T Jake Luciani 
Committed: Sat Sep 19 16:04:04 2015 -0400

--
 build.xml| 2 +-
 debian/changelog | 6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-19 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 4bb5976a7bd3b68e9ea05610c4b4e174645ad07a
Parents: 92b8131 cffa93c
Author: Aleksey Yeschenko 
Authored: Sat Sep 19 17:50:38 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Sat Sep 19 17:50:38 2015 +0100

--
 test/conf/cassandra_pig.yaml | 1 +
 1 file changed, 1 insertion(+)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-18 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 375465d1c603258b97caee4ed4a9ecddf382c771
Parents: 6f5c7a4 959b96e
Author: Aleksey Yeschenko 
Authored: Fri Sep 18 19:16:38 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Fri Sep 18 19:16:38 2015 +0100

--
 CHANGES.txt |  1 +
 .../apache/cassandra/hints/HintsCatalog.java|  8 +++
 .../cassandra/hints/HintsDispatchExecutor.java  | 64 +++-
 .../apache/cassandra/hints/HintsDispatcher.java |  4 +-
 .../apache/cassandra/hints/HintsService.java| 45 --
 .../cassandra/service/StorageService.java   | 29 -
 6 files changed, 124 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/375465d1/CHANGES.txt
--
diff --cc CHANGES.txt
index 0ffd919,d95d833..e805446
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-rc1
+  * Transfer hints to a different node on decommission (CASSANDRA-10198)
   * Check partition keys for CAS operations during stmt validation 
(CASSANDRA-10338)
   * Add custom query expressions to SELECT (CASSANDRA-10217)
   * Fix minor bugs in MV handling (CASSANDRA-10362)

[2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk

2015-09-18 Thread blerer 
Merge branch cassandra-3.0 into trunk


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

Branch: refs/heads/trunk
Commit: b653411f01fd11e031699ebf97d899e4968ec4ad
Parents: 21b134c aeee9f7
Author: blerer 
Authored: Fri Sep 18 11:38:06 2015 +0200
Committer: blerer 
Committed: Fri Sep 18 11:38:34 2015 +0200

--
 bin/cqlsh.py|  79 +--
 ...iver-internal-only-3.0.0a2.post0-03085e6.zip | Bin 0 -> 230830 bytes
 ...iver-internal-only-3.0.0a2.post0-9f91a6d.zip | Bin 230797 -> 0 bytes
 pylib/cqlshlib/cql3handling.py  |  24 +-
 .../cassandra/service/MigrationListener.java|   1 +
 5 files changed, 96 insertions(+), 8 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-18 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 5400b93bbcbb6b3e3831d5b5a9ecfcd846f55034
Parents: 82dfc29 9f335fe
Author: Sylvain Lebresne 
Authored: Fri Sep 18 12:13:21 2015 +0200
Committer: Sylvain Lebresne 
Committed: Fri Sep 18 12:13:21 2015 +0200

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/db/view/View.java | 17 +++--
 .../org/apache/cassandra/cql3/ViewTest.java | 76 +++-
 3 files changed, 85 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5400b93b/CHANGES.txt
--
diff --cc CHANGES.txt
index 7e4e378,d6554e9..334927a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-rc1
+  * Fix minor bugs in MV handling (CASSANDRA-10362)
   * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)
   * Improve MV schema representation (CASSANDRA-9921)
   * Add flag to enable/disable coordinator batchlog for MV writes 
(CASSANDRA-10230)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-18 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: be8b9f299ebdd3c342398fb09db625c59d0f6cb0
Parents: 375465d aef7169
Author: Aleksey Yeschenko 
Authored: Fri Sep 18 22:12:37 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Fri Sep 18 22:12:37 2015 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/utils/btree/BTreeSearchIterator.java  |  5 ++---
 .../apache/cassandra/utils/btree/TreeCursor.java| 16 +++-
 .../org/apache/cassandra/utils/LongBTreeTest.java   |  9 ++---
 4 files changed, 16 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/be8b9f29/CHANGES.txt
--
diff --cc CHANGES.txt
index e805446,2c0cde2..537eeeb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-rc1
+  * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301)
   * Transfer hints to a different node on decommission (CASSANDRA-10198)
   * Check partition keys for CAS operations during stmt validation 
(CASSANDRA-10338)
   * Add custom query expressions to SELECT (CASSANDRA-10217)

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-18 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 9967303f6e22db40400163d0625f15af74de9a05
Parents: bb82624 b99c863
Author: Sylvain Lebresne 
Authored: Fri Sep 18 13:24:15 2015 +0200
Committer: Sylvain Lebresne 
Committed: Fri Sep 18 13:24:15 2015 +0200

--
 doc/native_protocol_v3.spec |   3 +
 doc/native_protocol_v4.spec |   5 +
 .../org/apache/cassandra/cql3/QueryOptions.java |   6 +-
 .../apache/cassandra/cql3/QueryProcessor.java   |   3 +-
 .../org/apache/cassandra/cql3/ResultSet.java|   6 +-
 .../cql3/statements/SelectStatement.java|   4 +-
 .../org/apache/cassandra/db/Clustering.java |  29 +++
 .../org/apache/cassandra/db/LegacyLayout.java   |   2 +-
 .../cassandra/db/PartitionRangeReadCommand.java |   6 +-
 src/java/org/apache/cassandra/db/ReadQuery.java |   5 +-
 .../db/SinglePartitionNamesCommand.java |   1 +
 .../db/SinglePartitionReadCommand.java  |  14 +-
 .../org/apache/cassandra/db/rows/BTreeRow.java  |  48 +++-
 .../cassandra/db/rows/ComplexColumnData.java|   5 +
 src/java/org/apache/cassandra/db/rows/Row.java  |   3 +-
 src/java/org/apache/cassandra/db/view/View.java |   5 +-
 .../apache/cassandra/db/view/ViewBuilder.java   |   3 +-
 .../service/pager/AbstractQueryPager.java   |   4 +-
 .../service/pager/MultiPartitionPager.java  |   8 +-
 .../cassandra/service/pager/PagingState.java| 220 ---
 .../cassandra/service/pager/QueryPagers.java|   3 +-
 .../service/pager/RangeNamesQueryPager.java |   4 +-
 .../service/pager/RangeSliceQueryPager.java |  16 +-
 .../service/pager/SinglePartitionPager.java |  16 +-
 .../org/apache/cassandra/transport/CBUtil.java  |   7 +
 .../cassandra/service/QueryPagerTest.java   |  97 +++-
 .../service/pager/PagingStateTest.java  |  99 +
 27 files changed, 526 insertions(+), 96 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-18 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 46c0a55ea5d2f1412de8a1134da8ae5bc34c3cb3
Parents: 0c3575f 1b823ec
Author: Robert Stupp 
Authored: Fri Sep 18 12:36:48 2015 +0200
Committer: Robert Stupp 
Committed: Fri Sep 18 12:36:48 2015 +0200

--
 .../legacy_ma_clust/ma-1-big-CompressionInfo.db | Bin 83 -> 83 bytes
 .../legacy_ma_clust/ma-1-big-Data.db| Bin 5049 -> 5036 bytes
 .../legacy_ma_clust/ma-1-big-Digest.crc32   |   2 +-
 .../legacy_ma_clust/ma-1-big-Index.db   | Bin 157553 -> 157553 bytes
 .../legacy_ma_clust/ma-1-big-Statistics.db  | Bin 7045 -> 7048 bytes
 .../legacy_ma_clust/ma-1-big-TOC.txt|   8 
 .../ma-1-big-CompressionInfo.db | Bin 75 -> 75 bytes
 .../legacy_ma_clust_counter/ma-1-big-Data.db| Bin 4393 -> 4344 bytes
 .../ma-1-big-Digest.crc32   |   2 +-
 .../legacy_ma_clust_counter/ma-1-big-Index.db   | Bin 157553 -> 157553 bytes
 .../ma-1-big-Statistics.db  | Bin 7054 -> 7057 bytes
 .../legacy_ma_clust_counter/ma-1-big-TOC.txt|   8 
 .../legacy_ma_simple/ma-1-big-Data.db   | Bin 85 -> 85 bytes
 .../legacy_ma_simple/ma-1-big-Digest.crc32  |   2 +-
 .../legacy_ma_simple/ma-1-big-Statistics.db | Bin 4598 -> 4601 bytes
 .../legacy_ma_simple/ma-1-big-TOC.txt   |   8 
 .../legacy_ma_simple_counter/ma-1-big-Data.db   | Bin 106 -> 106 bytes
 .../ma-1-big-Digest.crc32   |   2 +-
 .../ma-1-big-Statistics.db  | Bin 4607 -> 4610 bytes
 .../legacy_ma_simple_counter/ma-1-big-TOC.txt   |   8 
 20 files changed, 20 insertions(+), 20 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-18 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 418ecb59ae8cf159c00c2d15c10b5aece03119dc
Parents: 95ba0e2 762b48f
Author: Sylvain Lebresne 
Authored: Fri Sep 18 18:28:40 2015 +0200
Committer: Sylvain Lebresne 
Committed: Fri Sep 18 18:28:40 2015 +0200

--
 .../org/apache/cassandra/db/ReadCommand.java| 80 +---
 1 file changed, 53 insertions(+), 27 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-18 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 6f5c7a4ea20f0de4a82a945c8d64c82f7980317b
Parents: 418ecb5 a29d206
Author: Aleksey Yeschenko 
Authored: Fri Sep 18 18:28:00 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Fri Sep 18 18:28:00 2015 +0100

--
 .../org/apache/cassandra/config/Schema.java |   9 +-
 .../io/sstable/format/SSTableReader.java|   6 +
 .../sstable/format/ClientModeSSTableTest.java   | 135 +++
 3 files changed, 147 insertions(+), 3 deletions(-)
--

  1   2   >