[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bdbdc1e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bdbdc1e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bdbdc1e Branch: refs/heads/cassandra-2.1 Commit: 4bdbdc1e397902ff35623878c7264324bf675afd Parents: c1c3375 852f084 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Mon Sep 8 22:21:13 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Mon Sep 8 22:21:13 2014 -0400 -- tools/stress/src/org/apache/cassandra/stress/StressMetrics.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/350a94c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/350a94c3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/350a94c3 Branch: refs/heads/cassandra-2.1 Commit: 350a94c3e3a4fe0597043d91ac8c1bae9f780731 Parents: bd396ec c81dc4b Author: Sylvain Lebresne sylv...@datastax.com Authored: Fri Sep 5 10:50:46 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Fri Sep 5 10:50:46 2014 +0200 -- .../unit/org/apache/cassandra/cql3/DeleteTest.java | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 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/dd972e6c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd972e6c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd972e6c Branch: refs/heads/cassandra-2.1 Commit: dd972e6c3f48619d30e4167dde92cd333d58ffad Parents: d304b7c 4501488 Author: Marcus Eriksson marc...@apache.org Authored: Fri Sep 5 11:06:57 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Fri Sep 5 11:06:57 2014 +0200 -- CHANGES.txt | 2 ++ .../db/compaction/CompactionManager.java| 9 +- .../cassandra/service/StorageService.java | 12 .../cassandra/service/StorageServiceMBean.java | 6 ++-- .../org/apache/cassandra/tools/NodeProbe.java | 30 5 files changed, 31 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd972e6c/CHANGES.txt -- diff --cc CHANGES.txt index 5404f83,befdcd7..a0ba08b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,56 -1,9 +1,58 @@@ +2.1.1 + * (cqlsh): Show progress of COPY operations (CASSANDRA-7789) + * Add syntax to remove multiple elements from a map (CASSANDRA-6599) + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839) + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606) + * (cqlsh) Display the current logged-in user (CASSANDRA-7785) + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815) + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE + output (CASSANDRA-7659) + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671) + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405) + * Support list index operations with conditions (CASSANDRA-7499) + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Explicitly disallow mixing multi-column and single-column + relations on clustering columns (CASSANDRA-7711) + * Better error message when condition is set on PK column (CASSANDRA-7804) + * Don't send schema change responses and events for no-op DDL + statements (CASSANDRA-7600) + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774) + * Throw InvalidRequestException when queries contain relations on entire + collection columns (CASSANDRA-7506) + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577) + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) +Merged from 1.2: + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788) + + 2.1.0 + * Avoid exposing internal classes over JMX (CASSANDRA-7879) + * Add null check for keys when freezing collection (CASSANDRA-7869) - - -2.1.0-rc7 * Add frozen keyword and require UDT to be frozen (CASSANDRA-7857) * Track added sstable size correctly (CASSANDRA-7239) * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/037963c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/037963c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/037963c6 Branch: refs/heads/cassandra-2.1 Commit: 037963c62f21030dba1828cc6562a2706355e03c Parents: 7d84043 c1dc378 Author: Tyler Hobbs ty...@datastax.com Authored: Fri Sep 5 11:10:31 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Fri Sep 5 11:10:31 2014 -0500 -- CHANGES.txt | 1 + ...assandra-driver-internal-only-2.1.0.post.zip | Bin 128879 - 129435 bytes 2 files changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/037963c6/CHANGES.txt -- diff --cc CHANGES.txt index 0ca5d4c,28c39e6..de7c9da --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,58 -1,10 +1,59 @@@ +2.1.1 + * (cqlsh): Show progress of COPY operations (CASSANDRA-7789) + * Add syntax to remove multiple elements from a map (CASSANDRA-6599) + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839) + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606) + * (cqlsh) Display the current logged-in user (CASSANDRA-7785) + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815) + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE + output (CASSANDRA-7659) + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671) + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405) + * Support list index operations with conditions (CASSANDRA-7499) + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Explicitly disallow mixing multi-column and single-column + relations on clustering columns (CASSANDRA-7711) + * Better error message when condition is set on PK column (CASSANDRA-7804) + * Don't send schema change responses and events for no-op DDL + statements (CASSANDRA-7600) + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774) + * Throw InvalidRequestException when queries contain relations on entire + collection columns (CASSANDRA-7506) + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577) + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) +Merged from 1.2: + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788) + + 2.1.0 + * cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863) * Avoid exposing internal classes over JMX (CASSANDRA-7879) * Add null check for keys when freezing collection (CASSANDRA-7869) - - -2.1.0-rc7 * Add frozen keyword and require UDT to be frozen (CASSANDRA-7857) * Track added sstable size correctly (CASSANDRA-7239) * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d215692 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d215692 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d215692 Branch: refs/heads/cassandra-2.1 Commit: 7d215692fdc226b15a72e5459f1d0f24cee8eeda Parents: 8d69214 5d5401d Author: Jason Brown jasobr...@apple.com Authored: Fri Sep 5 16:47:35 2014 -0700 Committer: Jason Brown jasobr...@apple.com Committed: Fri Sep 5 16:47:35 2014 -0700 -- --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 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/bff7572c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bff7572c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bff7572c Branch: refs/heads/cassandra-2.1 Commit: bff7572ca70455fcb2cf21880a2864a1d0030047 Parents: ed630e3 de62175 Author: Marcus Eriksson marc...@apache.org Authored: Mon Sep 1 09:11:48 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Mon Sep 1 09:11:48 2014 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/DataTracker.java | 6 ++ 2 files changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bff7572c/CHANGES.txt -- diff --cc CHANGES.txt index 30fcf27,c202586..ccce6f7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,54 -1,5 +1,55 @@@ -2.1.0-rc7 +2.1.1 + * (cqlsh): Show progress of COPY operations (CASSANDRA-7789) + * Add syntax to remove multiple elements from a map (CASSANDRA-6599) + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839) + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606) + * (cqlsh) Display the current logged-in user (CASSANDRA-7785) + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815) + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE + output (CASSANDRA-7659) + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671) + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405) + * Support list index operations with conditions (CASSANDRA-7499) + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Better error message when condition is set on PK column (CASSANDRA-7804) + * Don't send schema change responses and events for no-op DDL + statements (CASSANDRA-7600) + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774) + * Throw InvalidRequestException when queries contain relations on entire + collection columns (CASSANDRA-7506) + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577) + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) +Merged from 1.2: + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788) + + +2.1.0 + * Track added sstable size correctly (CASSANDRA-7239) * (cqlsh) Fix case insensitivity (CASSANDRA-7834) * Fix failure to stream ranges when moving (CASSANDRA-7836) * Correctly remove tmplink files (CASSANDRA-7803)
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ec097530 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec097530 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec097530 Branch: refs/heads/cassandra-2.1 Commit: ec0975304c9288c80037c249e12e397e7978 Parents: 5abd129 ce3fcbe Author: Jake Luciani j...@apache.org Authored: Wed Aug 27 11:07:24 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Wed Aug 27 11:07:24 2014 -0400 -- .../db/commitlog/CommitLogSegmentManager.java | 15 .../cql3/DropKeyspaceCommitLogRecycleTest.java | 91 2 files changed, 106 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec097530/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4327c29b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4327c29b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4327c29b Branch: refs/heads/cassandra-2.1 Commit: 4327c29be80847aef2c772dbf2f3a6bc2e8986e0 Parents: 44a9d8c 3b3afb3 Author: Tyler Hobbs ty...@datastax.com Authored: Wed Aug 27 11:03:10 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Aug 27 11:03:10 2014 -0500 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 10 ++ src/java/org/apache/cassandra/streaming/StreamPlan.java | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4327c29b/CHANGES.txt -- diff --cc CHANGES.txt index b2b4a5a,0b45cef..979b017 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,52 -1,5 +1,53 @@@ +2.1.1 + * Add syntax to remove multiple elements from a map (CASSANDRA-6599) + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839) + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606) + * (cqlsh) Display the current logged-in user (CASSANDRA-7785) + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815) + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE + output (CASSANDRA-7659) + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671) + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405) + * Support list index operations with conditions (CASSANDRA-7499) + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Don't send schema change responses and events for no-op DDL + statements (CASSANDRA-7600) + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774) + * Throw InvalidRequestException when queries contain relations on entire + collection columns (CASSANDRA-7506) + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577) + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) +Merged from 1.2: + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788) + + 2.1.0 + * Fix failure to stream ranges when moving (CASSANDRA-7836) * Correctly remove tmplink files (CASSANDRA-7803) * (cqlsh) Fix column name formatting for functions, CAS operations, and UDT field selections (CASSANDRA-7806) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4327c29b/src/java/org/apache/cassandra/streaming/StreamPlan.java --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7f9c8d2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7f9c8d2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7f9c8d2 Branch: refs/heads/cassandra-2.1 Commit: c7f9c8d21aa47e80db78d5537ceaa7e4a40f63b3 Parents: 4327c29 58c09cb Author: Tyler Hobbs ty...@datastax.com Authored: Wed Aug 27 14:20:52 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Aug 27 14:20:52 2014 -0500 -- CHANGES.txt| 1 + pylib/cqlshlib/cql3handling.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7f9c8d2/CHANGES.txt -- diff --cc CHANGES.txt index 979b017,18c0a96..0f44c91 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,52 -1,5 +1,53 @@@ +2.1.1 + * Add syntax to remove multiple elements from a map (CASSANDRA-6599) + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839) + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606) + * (cqlsh) Display the current logged-in user (CASSANDRA-7785) + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815) + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE + output (CASSANDRA-7659) + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671) + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405) + * Support list index operations with conditions (CASSANDRA-7499) + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Don't send schema change responses and events for no-op DDL + statements (CASSANDRA-7600) + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774) + * Throw InvalidRequestException when queries contain relations on entire + collection columns (CASSANDRA-7506) + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577) + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) +Merged from 1.2: + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788) + + 2.1.0 + * (cqlsh) Fix case insensitivity (CASSANDRA-7834) * Fix failure to stream ranges when moving (CASSANDRA-7836) * Correctly remove tmplink files (CASSANDRA-7803) * (cqlsh) Fix column name formatting for functions, CAS operations, http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7f9c8d2/pylib/cqlshlib/cql3handling.py --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8c1fc413 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c1fc413 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c1fc413 Branch: refs/heads/cassandra-2.1 Commit: 8c1fc4130515fe3539bafd1e453b34c1ea303141 Parents: fdf293d 86e3012 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Aug 26 17:27:01 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Aug 26 17:27:01 2014 +0200 -- src/java/org/apache/cassandra/cql3/Lists.java | 6 +++--- src/java/org/apache/cassandra/cql3/Maps.java| 8 +++ .../org/apache/cassandra/cql3/Operation.java| 22 ++-- src/java/org/apache/cassandra/cql3/Sets.java| 8 +++ 4 files changed, 22 insertions(+), 22 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dac984f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dac984f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dac984f1 Branch: refs/heads/cassandra-2.1 Commit: dac984f14644f1b344e58cf7fe21892142ab95f1 Parents: e3a4fba 508db1e Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Aug 23 01:04:37 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Aug 23 01:04:37 2014 +0300 -- src/java/org/apache/cassandra/config/CFMetaData.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f36d1b51 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f36d1b51 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f36d1b51 Branch: refs/heads/cassandra-2.1 Commit: f36d1b51b7c467ee6e54096328ebc28ba1bbf67b Parents: 5aee128 a41d527 Author: Marcus Eriksson marc...@apache.org Authored: Thu Aug 21 10:37:36 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Thu Aug 21 10:37:36 2014 +0200 -- CHANGES.txt | 1 + .../cassandra/io/sstable/SSTableDeletingTask.java | 12 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f36d1b51/CHANGES.txt -- diff --cc CHANGES.txt index f466b72,d7c3dea..2320653 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,42 -1,5 +1,43 @@@ +2.1.1 + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405) + * Support list index operations with conditions (CASSANDRA-7499) + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774) + * Throw InvalidRequestException when queries contain relations on entire + collection columns (CASSANDRA-7506) + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577) + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) +Merged from 1.2: + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788) + + 2.1.0 + * Correctly remove tmplink files (CASSANDRA-7803) * (cqlsh) Fix column name formatting for functions, CAS operations, and UDT field selections (CASSANDRA-7806) * (cqlsh) Fix COPY FROM handling of null/empty primary key
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Conflicts:
bin/cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1aea6d59
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1aea6d59
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1aea6d59
Branch: refs/heads/cassandra-2.1
Commit: 1aea6d5917b258ea22668f1d4a1c7bd6588784bd
Parents: 6e05125 c4191ed
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Aug 20 17:51:40 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Aug 20 17:51:40 2014 -0500
--
CHANGES.txt| 2 ++
bin/cqlsh | 16 +---
pylib/cqlshlib/cql3handling.py | 8
3 files changed, 15 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aea6d59/CHANGES.txt
--
diff --cc CHANGES.txt
index 5103d83,92a177d..f466b72
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,42 -1,6 +1,44 @@@
+2.1.1
+ * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
+ * Support list index operations with conditions (CASSANDRA-7499)
+ * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
+ * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
+ * (cqlsh) Error when tracing query (CASSANDRA-7613)
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of
partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace
(CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
+ * Throw InvalidRequestException when queries contain relations on entire
+ collection columns (CASSANDRA-7506)
+ * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
+ * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
+ * (cqlsh) cqlsh should automatically disable tracing when selecting
+ from system_traces (CASSANDRA-7641)
+ * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
+ * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
+ * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS
(CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector
(CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
+Merged from 1.2:
+ * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788)
+
+
2.1.0
+ * (cqlsh) Fix column name formatting for functions, CAS operations,
+and UDT field selections (CASSANDRA-7806)
* (cqlsh) Fix COPY FROM handling of null/empty primary key
values (CASSANDRA-7792)
* Fix ordering of static cells (CASSANDRA-7763)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aea6d59/bin/cqlsh
--
diff --cc bin/cqlsh
index 852f4f5,686e07b..340566d
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -522,7 -521,7 +522,8 @@@ class Shell(cmd.Cmd)
self.session = self.conn.connect(keyspace)
else:
self.session = self.conn.connect()
+self.session.default_timeout = client_timeout
+ self.session.row_factory = ordered_dict_factory
self.get_connection_versions()
self.current_keyspace = keyspace
@@@ -618,11 -613,12 +619,11 @@@
def get_connection_versions(self):
result, = self.session.execute(select * from system.local where key
= 'local')
vers = {
- 'build': result.release_version,
- 'protocol': result.native_protocol_version,
- 'cql': result.cql_version,
+ 'build': result['release_version'],
+ 'protocol': result['native_protocol_version'],
+ 'cql': result['cql_version'],
}
self.connection_versions = vers
-self.cass_ver_tuple = tuple(map(int, vers['build'].split('-',
1)[0].split('.')[:3]))
def
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a03d4bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a03d4bd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a03d4bd Branch: refs/heads/cassandra-2.1 Commit: 3a03d4bd55e0fbb6e18f7709eedd5148e0f18a68 Parents: 92325cc 94262c4 Author: Tyler Hobbs ty...@datastax.com Authored: Tue Aug 19 14:55:04 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Tue Aug 19 14:55:04 2014 -0500 -- CHANGES.txt | 2 ++ bin/cqlsh | 12 +--- 2 files changed, 11 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a03d4bd/CHANGES.txt -- diff --cc CHANGES.txt index 0763738,5113057..d29a2db --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,38 -1,6 +1,40 @@@ +2.1.1 + * Support list index operations with conditions (CASSANDRA-7499) + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Throw InvalidRequestException when queries contain relations on entire + collection columns (CASSANDRA-7506) + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577) + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + 2.1.0 + * (cqlsh) Fix COPY FROM handling of null/empty primary key +values (CASSANDRA-7792) * Fix ordering of static cells (CASSANDRA-7763) Merged from 2.0: * Fix PRSI handling of CQL3 row markers for row cleanup (CASSANDRA-7787) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a03d4bd/bin/cqlsh --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f454fecf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f454fecf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f454fecf
Branch: refs/heads/cassandra-2.1
Commit: f454fecf6ed11ff27c2b6b472ba0b1c88dcc1985
Parents: 5549680 56db001
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 18 14:25:29 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 18 14:25:29 2014 +0200
--
CHANGES.txt | 1 +
.../apache/cassandra/db/AbstractNativeCell.java | 11 ++
.../cassandra/db/composites/AbstractCType.java | 22
.../composites/CompoundSparseCellNameType.java | 11 ++
4 files changed, 45 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f454fecf/CHANGES.txt
--
diff --cc CHANGES.txt
index 2e6b184,8aafd98..9ab4109
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,35 @@@
+2.1.1
+ * Support list index operations with conditions (CASSANDRA-7499)
+ * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
+ * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
+ * (cqlsh) Error when tracing query (CASSANDRA-7613)
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of
partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace
(CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
+ * (cqlsh) cqlsh should automatically disable tracing when selecting
+ from system_traces (CASSANDRA-7641)
+ * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
+ * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
+ * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS
(CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector
(CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
+
2.1.0
+ * Fix ordering of static cells (CASSANDRA-7763)
Merged from 2.0:
* Fix dropping collection when it's the last regular column (CASSANDRA-7744)
* Properly reject operations on list index with conditions (CASSANDRA-7499)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f454fecf/src/java/org/apache/cassandra/db/AbstractNativeCell.java
--
diff --cc src/java/org/apache/cassandra/db/AbstractNativeCell.java
index d79ad19,f3128b8..7e85af3
--- a/src/java/org/apache/cassandra/db/AbstractNativeCell.java
+++ b/src/java/org/apache/cassandra/db/AbstractNativeCell.java
@@@ -658,38 -645,4 +658,49 @@@ public abstract class AbstractNativeCel
checkPosition(offset, length);
return MemoryUtil.getByteBuffer(peer + offset, length);
}
+
+// requires isByteOrderComparable to be true. Compares the name
components only; ; may need to compare EOC etc still
+public final int compareTo(final Composite that)
+{
++if (isStatic() != that.isStatic())
++{
++// Static sorts before non-static no matter what, except for
empty which
++// always sort first
++if (isEmpty())
++return that.isEmpty() ? 0 : -1;
++if (that.isEmpty())
++return 1;
++return isStatic() ? -1 : 1;
++}
++
+int size = size();
+int size2 = that.size();
+int minSize = Math.min(size, size2);
+int startDelta = 0;
+int cellNamesOffset = nameDeltaOffset(size);
+for (int i = 0 ; i minSize ; i++)
+{
+int endDelta = i size - 1 ? getShort(nameDeltaOffset(i + 1)) :
valueStartOffset() - cellNamesOffset;
+long offset = peer + cellNamesOffset + startDelta;
+
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7035cfcc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7035cfcc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7035cfcc Branch: refs/heads/cassandra-2.1 Commit: 7035cfccfcaf48ff64722942430ca8036e2e1e02 Parents: 35999b3 cb772e5 Author: Aleksey Yeschenko alek...@apache.org Authored: Sun Aug 17 20:49:58 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sun Aug 17 20:49:58 2014 +0300 -- --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eab15846 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eab15846 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eab15846 Branch: refs/heads/cassandra-2.1 Commit: eab158462441ba414792acc228051250be34ab24 Parents: de5bb58 561f6ef Author: Jake Luciani j...@apache.org Authored: Fri Aug 15 15:15:38 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Fri Aug 15 15:15:38 2014 -0400 -- .../apache/cassandra/io/util/BufferedRandomAccessFileTest.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea686198 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea686198 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea686198 Branch: refs/heads/cassandra-2.1 Commit: ea686198fdecc1c251f05c443b2c0c5878dbbdd1 Parents: eab1584 23233b3 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Aug 15 22:20:29 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Aug 15 22:20:29 2014 +0300 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++--- src/java/org/apache/cassandra/service/CacheService.java | 11 +++ 3 files changed, 15 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea686198/CHANGES.txt -- diff --cc CHANGES.txt index ced91fd,5b5283f..9e9b805 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,32 -1,5 +1,33 @@@ +2.1.1 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + 2.1.0-rc6 + * Invalidate all caches on table drop (CASSANDRA-7561) * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765) * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741) * Add tracing entries about concurrent range requests (CASSANDRA-7599)
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96d0331f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96d0331f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96d0331f Branch: refs/heads/cassandra-2.1 Commit: 96d0331ff63c905120c3ae564979c62954e71c78 Parents: f26e86c f2d6057 Author: Jake Luciani j...@apache.org Authored: Fri Aug 15 17:16:18 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Fri Aug 15 17:16:18 2014 -0400 -- CHANGES.txt | 1 + .../org/apache/cassandra/transport/Message.java | 23 +++- 2 files changed, 14 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/96d0331f/CHANGES.txt -- diff --cc CHANGES.txt index b68605e,eeb115f..113de3e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,5 +1,34 @@@ +2.1.1 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + 2.1.0-rc6 + * Fix OOM issue from netty caching over time (CASSANDRA-7743) * json2sstable couldn't import JSON for CQL table (CASSANDRA-7477) * Invalidate all caches on table drop (CASSANDRA-7561) * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f08785fc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f08785fc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f08785fc Branch: refs/heads/cassandra-2.1 Commit: f08785fcc2a4dd5ad4c2c621808d497c3eb6245c Parents: 42f2f80 fe4c8c2 Author: Jake Luciani j...@apache.org Authored: Wed Aug 13 10:50:36 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Wed Aug 13 10:50:36 2014 -0400 -- src/java/org/apache/cassandra/service/CassandraDaemon.java | 9 - src/java/org/apache/cassandra/transport/Frame.java | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d71c8aa8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d71c8aa8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d71c8aa8 Branch: refs/heads/cassandra-2.1 Commit: d71c8aa884e049ee10d8ebf4c90c6c3df8c6883b Parents: 25c335f 0471f40 Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Aug 12 17:44:52 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Aug 12 17:44:52 2014 +0300 -- CHANGES.txt | 1 + lib/cassandra-driver-internal-only-2.1.0.post.zip | Bin 0 - 128879 bytes ...assandra-driver-internal-only-2.1.0c1.post.zip | Bin 128949 - 0 bytes 3 files changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d71c8aa8/CHANGES.txt -- diff --cc CHANGES.txt index de659e1,7e04bcb..01989f9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,5 +1,26 @@@ +2.1.1 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + 2.1.0-rc6 + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729) * Remove netty buffer ref-counting (CASSANDRA-7735) * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742) * Include stress yaml example in release and deb (CASSANDRA-7717)
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/993f4f5e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/993f4f5e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/993f4f5e Branch: refs/heads/cassandra-2.1 Commit: 993f4f5ed1db568d679a522aedfee2c7e763d52f Parents: 712f54f 6795b6e Author: Tyler Hobbs ty...@datastax.com Authored: Tue Aug 12 13:31:12 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Tue Aug 12 13:31:12 2014 -0500 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 6 +- 2 files changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/993f4f5e/CHANGES.txt -- diff --cc CHANGES.txt index e6335fc,de45aeb..7957eda --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,5 +1,26 @@@ +2.1.1 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + 2.1.0-rc6 + * Add tracing entries about concurrent range requests (CASSANDRA-7599) * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729) * Remove netty buffer ref-counting (CASSANDRA-7735) * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742) http://git-wip-us.apache.org/repos/asf/cassandra/blob/993f4f5e/src/java/org/apache/cassandra/service/StorageProxy.java --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17193da3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17193da3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17193da3 Branch: refs/heads/cassandra-2.1 Commit: 17193da39ac0040b64db7f8ac9e13b6a0c23b4f5 Parents: 70f277f 59a8e1c Author: Tyler Hobbs ty...@datastax.com Authored: Tue Aug 12 13:59:10 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Tue Aug 12 13:59:10 2014 -0500 -- CHANGES.txt | 1 + .../apache/cassandra/service/StorageProxy.java | 44 2 files changed, 28 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17193da3/CHANGES.txt -- diff --cc CHANGES.txt index 7957eda,be91bbc..c2dc249 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,5 +1,26 @@@ +2.1.1 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + 2.1.0-rc6 + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741) * Add tracing entries about concurrent range requests (CASSANDRA-7599) * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729) * Remove netty buffer ref-counting (CASSANDRA-7735) http://git-wip-us.apache.org/repos/asf/cassandra/blob/17193da3/src/java/org/apache/cassandra/service/StorageProxy.java --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54215a21 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54215a21 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54215a21 Branch: refs/heads/cassandra-2.1 Commit: 54215a21f0d671e71d9ac0a21477958a6298dc44 Parents: 25982d1 dc8b4e1 Author: Joshua McKenzie josh.mcken...@datastax.com Authored: Tue Aug 12 16:40:15 2014 -0500 Committer: Joshua McKenzie josh.mcken...@datastax.com Committed: Tue Aug 12 16:40:15 2014 -0500 -- build.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/54215a21/build.xml --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d9621cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d9621cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d9621cd Branch: refs/heads/cassandra-2.1 Commit: 5d9621cd9d13efe7e9a4042097bbc6e5c8796165 Parents: 384f873 59806a8 Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Aug 12 03:34:11 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Aug 12 03:34:11 2014 +0300 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Keyspace.java | 4 +++- .../org/apache/cassandra/db/index/SecondaryIndexManager.java | 8 .../apache/cassandra/db/index/PerRowSecondaryIndexTest.java | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d9621cd/CHANGES.txt -- diff --cc CHANGES.txt index f7dcbd7,a426df4..916d42b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,5 +1,26 @@@ +2.1.1 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + 2.1.0-rc6 + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742) * Include stress yaml example in release and deb (CASSANDRA-7717) * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695) * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d9621cd/src/java/org/apache/cassandra/db/Keyspace.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d9621cd/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d9621cd/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d61443e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d61443e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d61443e9 Branch: refs/heads/cassandra-2.1 Commit: d61443e9861090bbf4ff251611c8b7146aae1ac2 Parents: 5d9621cd a1348aa Author: Jake Luciani j...@apache.org Authored: Mon Aug 11 20:40:16 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Mon Aug 11 20:40:16 2014 -0400 -- CHANGES.txt | 1 + .../cql3/statements/BatchStatement.java | 13 +- .../cql3/statements/ModificationStatement.java | 8 +- .../apache/cassandra/db/CounterMutation.java| 12 -- src/java/org/apache/cassandra/db/IMutation.java | 11 -- src/java/org/apache/cassandra/db/Mutation.java | 31 --- .../apache/cassandra/net/MessagingService.java | 14 +- .../cassandra/net/ResponseVerbHandler.java | 6 - .../apache/cassandra/service/QueryState.java| 12 -- .../apache/cassandra/service/StorageProxy.java | 190 +++ .../org/apache/cassandra/transport/CBUtil.java | 14 +- .../org/apache/cassandra/transport/Message.java | 1 - 12 files changed, 80 insertions(+), 233 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d61443e9/CHANGES.txt -- diff --cc CHANGES.txt index 916d42b,a180df9..8db1a11 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,5 +1,26 @@@ +2.1.1 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + 2.1.0-rc6 + * Remove netty buffer ref-counting (CASSANDRA-7735) * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742) * Include stress yaml example in release and deb (CASSANDRA-7717) * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d61443e9/src/java/org/apache/cassandra/service/StorageProxy.java --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fcb79b79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcb79b79 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fcb79b79 Branch: refs/heads/cassandra-2.1 Commit: fcb79b799b823399e49c2bef2674e7d1ac9e30a5 Parents: 2c701f8 6ba4e72 Author: Sylvain Lebresne sylv...@datastax.com Authored: Fri Aug 8 12:44:14 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Fri Aug 8 12:44:14 2014 +0200 -- tools/lib/cassandra-driver-core-2.0.1.jar | Bin 519771 - 0 bytes tools/lib/cassandra-driver-core-2.0.4.jar | Bin 0 - 544025 bytes 2 files changed, 0 insertions(+), 0 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8aed4196 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8aed4196 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8aed4196 Branch: refs/heads/cassandra-2.1 Commit: 8aed4196d2f23f5c1207a92d23f47aa5868b9015 Parents: fcb79b7 a932b62 Author: Sylvain Lebresne sylv...@datastax.com Authored: Fri Aug 8 12:50:44 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Fri Aug 8 12:50:44 2014 +0200 -- CHANGES.txt | 1 + build.xml| 5 + debian/rules | 1 + 3 files changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8aed4196/CHANGES.txt -- diff --cc CHANGES.txt index 2bd8667,9ebb8cd..0398235 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,5 +1,26 @@@ +2.1.1 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + 2.1.0-final + * Include stress yaml example in release and deb (CASSANDRA-7717) * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695) * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687) * Fix binding null values inside UDT (CASSANDRA-7685) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8aed4196/build.xml --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78b734e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78b734e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78b734e2 Branch: refs/heads/cassandra-2.1 Commit: 78b734e2eb79e541088a4ac404b27be74410ba4a Parents: 6beb13f e0c4c6e Author: Sylvain Lebresne sylv...@datastax.com Authored: Thu Aug 7 16:07:29 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Thu Aug 7 16:07:29 2014 +0200 -- .../apache/cassandra/config/DatabaseDescriptor.java | 5 + .../org/apache/cassandra/service/StorageService.java | 6 ++ .../apache/cassandra/service/StorageServiceMBean.java | 3 +++ src/java/org/apache/cassandra/tools/NodeProbe.java| 4 src/java/org/apache/cassandra/tools/NodeTool.java | 14 ++ 5 files changed, 32 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/78b734e2/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2c701f8f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c701f8f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2c701f8f Branch: refs/heads/cassandra-2.1 Commit: 2c701f8f9a87bd4388e917eab8910f7fa865b5bc Parents: 756c85e b3ada2b Author: Jake Luciani j...@apache.org Authored: Thu Aug 7 14:52:56 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Thu Aug 7 14:52:56 2014 -0400 -- CHANGES.txt | 1 + .../cassandra/service/CassandraDaemon.java | 9 + .../apache/cassandra/cql3/CorruptionTest.java | 195 +++ 3 files changed, 205 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c701f8f/CHANGES.txt -- diff --cc CHANGES.txt index c7f2510,aef0c40..2bd8667 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,5 +1,26 @@@ +2.1.1 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + 2.1.0-final + * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695) * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687) * Fix binding null values inside UDT (CASSANDRA-7685) * Fix UDT field selection with empty fields (CASSANDRA-7670)
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb0112be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb0112be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb0112be Branch: refs/heads/cassandra-2.1 Commit: bb0112be10d144a4b85e01d1a5add85eca5e618f Parents: 579a853 fd5cf23 Author: Tyler Hobbs ty...@datastax.com Authored: Wed Aug 6 14:02:00 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Aug 6 14:02:00 2014 -0500 -- --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8a3fc029 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a3fc029 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a3fc029 Branch: refs/heads/cassandra-2.1 Commit: 8a3fc0292723038e0af54944c0679c51a500befe Parents: e6602f7 a3d8375a Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Aug 5 10:38:07 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Aug 5 10:38:07 2014 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/UserTypes.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a3fc029/CHANGES.txt -- diff --cc CHANGES.txt index 590c2fe,98a0246..3588553 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,6 +1,22 @@@ +2.1.1 + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + 2.1.0-final * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687) + * Fix binding null values inside UDT (CASSANDRA-7685) Merged from 2.0: * Update java driver (for hadoop) (CASSANDRA-7618) * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3612b84c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3612b84c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3612b84c Branch: refs/heads/cassandra-2.1 Commit: 3612b84c69180c47cca9898f48ac0ae869c94711 Parents: 8a3fc02 2d21160 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Aug 5 14:47:42 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Aug 5 14:47:42 2014 +0200 -- test/unit/org/apache/cassandra/cql3/CQLTester.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/622ae508 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/622ae508 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/622ae508 Branch: refs/heads/cassandra-2.1 Commit: 622ae50854e6e8ef96582094735525e654a5b388 Parents: 3612b84 9f1e957 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Aug 5 15:47:49 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Aug 5 15:47:49 2014 +0200 -- src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/622ae508/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f302eb78 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f302eb78 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f302eb78 Branch: refs/heads/cassandra-2.1 Commit: f302eb78445119372770e54dfd32837aa3c0912a Parents: 8d06dd1 520de13 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Aug 4 14:14:49 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Aug 4 14:14:49 2014 +0200 -- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f302eb78/CHANGES.txt -- diff --cc CHANGES.txt index 24d3d50,0927a30..e2cc92b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,6 +1,20 @@@ +2.1.1 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + 2.1.0-final + + 2.1.0-rc5 * Reject counters inside user types (CASSANDRA-7672) * Switch to notification-based GCInspector (CASSANDRA-7638) * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2218d0d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2218d0d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2218d0d Branch: refs/heads/cassandra-2.1 Commit: b2218d0d824407b6760320d03b1751b52afc00d7 Parents: 63d1d29 fb3995a Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Aug 2 13:41:11 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Aug 2 13:41:11 2014 +0300 -- CHANGES.txt | 1 + .../apache/cassandra/cql3/statements/CreateTypeStatement.java | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2218d0d/CHANGES.txt -- diff --cc CHANGES.txt index c39490a,eaa3b43..c76b310 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +2.1.1 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + + 2.1.0-final + * Reject counters inside user types (CASSANDRA-7672) * Switch to notification-based GCInspector (CASSANDRA-7638) * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656) * Don't use strict consistency when replacing (CASSANDRA-7568)
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5a1c374 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5a1c374 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5a1c374 Branch: refs/heads/cassandra-2.1 Commit: f5a1c374c48898fa934792da680f80ccecf92f30 Parents: b407ebc d667556 Author: Jake Luciani j...@apache.org Authored: Fri Aug 1 09:24:42 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Fri Aug 1 09:24:42 2014 -0400 -- tools/cqlstress-counter-example.yaml| 7 +--- tools/cqlstress-example.yaml| 8 + tools/cqlstress-insanity-example.yaml | 18 +++ .../apache/cassandra/stress/StressProfile.java | 34 +++- .../org/apache/cassandra/stress/StressYaml.java | 1 - 5 files changed, 25 insertions(+), 43 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/169b1cf1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/169b1cf1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/169b1cf1 Branch: refs/heads/cassandra-2.1 Commit: 169b1cf19e584f106512a545f206eccee09cc7be Parents: f5a1c37 1921b98 Author: Jake Luciani j...@apache.org Authored: Fri Aug 1 09:33:04 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Fri Aug 1 09:33:04 2014 -0400 -- tools/stress/src/org/apache/cassandra/stress/StressProfile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b5990ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b5990ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b5990ae Branch: refs/heads/cassandra-2.1 Commit: 8b5990ae99697aa265e1c6664e436cb44f65756f Parents: 5f0413b c46477b Author: Tyler Hobbs ty...@datastax.com Authored: Fri Aug 1 10:36:46 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Fri Aug 1 10:36:46 2014 -0500 -- CHANGES.txt| 2 ++ src/java/org/apache/cassandra/io/sstable/ColumnNameHelper.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b5990ae/CHANGES.txt -- diff --cc CHANGES.txt index 2d9d912,c2ae6dc..a7c1ab0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,19 @@@ +2.1.1 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + + 2.1.0-final + * Fix min/max cell name collection on 2.0 SSTables with range +tombstones (CASSANDRA-7593) * Tolerate min/max cell names of different lengths (CASSANDRA-7651) * Filter cached results correctly (CASSANDRA-7636) * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/46973188 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46973188 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46973188 Branch: refs/heads/cassandra-2.1 Commit: 46973188cd815232c45f19605cb783fadde578e1 Parents: 6e15762 a48b3c4 Author: Jake Luciani j...@apache.org Authored: Fri Aug 1 12:49:02 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Fri Aug 1 12:49:02 2014 -0400 -- NEWS.txt | 2 +- src/java/org/apache/cassandra/dht/RangeStreamer.java | 4 ++-- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40a21c0b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40a21c0b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40a21c0b Branch: refs/heads/cassandra-2.1 Commit: 40a21c0bf6f0a9dfacf39ca3e3047b6987f2bb4c Parents: 824ffa1 fe78e81 Author: Tyler Hobbs ty...@datastax.com Authored: Fri Aug 1 18:09:44 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Fri Aug 1 18:09:44 2014 -0500 -- CHANGES.txt | 1 + ...assandra-driver-internal-only-2.1.0b1.post.zip | Bin 125786 - 0 bytes ...assandra-driver-internal-only-2.1.0c1.post.zip | Bin 0 - 128949 bytes 3 files changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/40a21c0b/CHANGES.txt -- diff --cc CHANGES.txt index 9eb620c,c95a22c..e7e2304 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +2.1.1 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + + 2.1.0-final + * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656) * Don't use strict consistency when replacing (CASSANDRA-7568) * Fix min/max cell name collection on 2.0 SSTables with range tombstones (CASSANDRA-7593)
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63d1d296 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63d1d296 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63d1d296 Branch: refs/heads/cassandra-2.1 Commit: 63d1d2968c59100f5a458b64ef884d4b675557f6 Parents: d33e29a 85b7438 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sat Aug 2 01:45:18 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sat Aug 2 01:45:18 2014 -0400 -- src/java/org/apache/cassandra/streaming/StreamCoordinator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b407ebc8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b407ebc8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b407ebc8 Branch: refs/heads/cassandra-2.1 Commit: b407ebc895603e33af763cbf30ca661192cf7eec Parents: e3d5b98 4632673 Author: Tyler Hobbs ty...@datastax.com Authored: Thu Jul 31 17:33:03 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Thu Jul 31 17:33:03 2014 -0500 -- CHANGES.txt | 1 + .../apache/cassandra/db/filter/ColumnSlice.java | 21 ++- .../cassandra/db/filter/SliceQueryFilter.java | 1 - .../cassandra/db/filter/ColumnSliceTest.java| 66 4 files changed, 85 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b407ebc8/CHANGES.txt -- diff --cc CHANGES.txt index 2501e51,fcd..5f83eef --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +2.1.1 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + + 2.1.0-final + * Tolerate min/max cell names of different lengths (CASSANDRA-7651) * Filter cached results correctly (CASSANDRA-7636) * Fix tracing on the new SEPExecutor (CASSANDRA-7644) * Remove shuffle and taketoken (CASSANDRA-7601) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b407ebc8/src/java/org/apache/cassandra/db/filter/ColumnSlice.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b407ebc8/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b407ebc8/test/unit/org/apache/cassandra/db/filter/ColumnSliceTest.java --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40d7bdf8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40d7bdf8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40d7bdf8 Branch: refs/heads/cassandra-2.1 Commit: 40d7bdf80cad7bd69441289dbccbf182513b3e18 Parents: 3da7d9e cde5666 Author: Marcus Eriksson marc...@apache.org Authored: Thu Jul 31 07:46:16 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Thu Jul 31 07:46:16 2014 +0200 -- src/java/org/apache/cassandra/db/ColumnFamily.java | 4 ++-- .../org/apache/cassandra/db/compaction/LazilyCompactedRow.java | 4 ++-- src/java/org/apache/cassandra/io/sstable/SSTableWriter.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: bin/cqlsh Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/307f9161 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/307f9161 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/307f9161 Branch: refs/heads/cassandra-2.1 Commit: 307f91617215eea5338f8c1319a735453eb02309 Parents: 5c47d8a 6843b55 Author: Tyler Hobbs ty...@datastax.com Authored: Tue Jul 29 16:01:20 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Tue Jul 29 16:01:20 2014 -0500 -- CHANGES.txt | 1 + bin/cqlsh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/307f9161/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/307f9161/bin/cqlsh -- diff --cc bin/cqlsh index b733322,551ad54..1b682f0 --- a/bin/cqlsh +++ b/bin/cqlsh @@@ -932,9 -920,11 +932,10 @@@ class Shell(cmd.Cmd) self.decoding_errors = [] self.writeresult() -if rows : ++if rows: + rows = list(rows) # this may be an iterator if the result is large enough to page -self.print_static_result(rows) +self.print_static_result(rows, cfMetaData) - self.writeresult((%d rows) % len(rows or [])) -self.writeresult() if self.decoding_errors: for err in self.decoding_errors[:2]:
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2236afb7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2236afb7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2236afb7 Branch: refs/heads/cassandra-2.1 Commit: 2236afb7a06725f9ceb13bab8c2180eb0d6134f5 Parents: 3744d77 ee62ae1 Author: Marcus Eriksson marc...@apache.org Authored: Mon Jul 28 12:49:06 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Mon Jul 28 12:49:06 2014 +0200 -- CHANGES.txt | 1 + .../org/apache/cassandra/io/sstable/metadata/StatsMetadata.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2236afb7/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/192f693b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/192f693b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/192f693b Branch: refs/heads/cassandra-2.1 Commit: 192f693b5cedd35273f316ed98b9385c23804d0c Parents: f03e505 5001b38 Author: Tyler Hobbs ty...@datastax.com Authored: Fri Jul 25 13:05:46 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Fri Jul 25 13:05:46 2014 -0500 -- CHANGES.txt | 3 ++- bin/cqlsh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/192f693b/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/192f693b/bin/cqlsh --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/831dd124 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/831dd124 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/831dd124 Branch: refs/heads/cassandra-2.1 Commit: 831dd124f51531b365bf038eb98dff08dea0cce4 Parents: b2a37c7 9082281 Author: Tyler Hobbs ty...@datastax.com Authored: Fri Jul 25 13:16:07 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Fri Jul 25 13:16:07 2014 -0500 -- CHANGES.txt | 2 ++ doc/native_protocol_v1.spec | 9 ++-- doc/native_protocol_v2.spec | 9 ++-- .../org/apache/cassandra/transport/Event.java | 23 +--- 4 files changed, 36 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/831dd124/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2c511ea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2c511ea Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2c511ea Branch: refs/heads/cassandra-2.1 Commit: b2c511eacb43f1558ca21a46bfc560fc6c2f Parents: 831dd12 638c40e Author: Tyler Hobbs ty...@datastax.com Authored: Fri Jul 25 13:26:41 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Fri Jul 25 13:26:41 2014 -0500 -- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/service/StorageProxy.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2c511ea/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2c511ea/src/java/org/apache/cassandra/service/StorageProxy.java --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3fc8bb1e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3fc8bb1e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3fc8bb1e Branch: refs/heads/cassandra-2.1 Commit: 3fc8bb1edf4f6eddd3f92e6b6809a22d427dfd2e Parents: b2c511e 83b3f13 Author: Tyler Hobbs ty...@datastax.com Authored: Fri Jul 25 14:27:12 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Fri Jul 25 14:27:12 2014 -0500 -- CHANGES.txt | 1 + bin/cassandra| 3 ++- bin/cassandra-cli| 1 + bin/cassandra-shuffle| 1 + bin/cassandra.in.sh | 4 bin/nodetool | 1 + bin/sstablekeys | 1 + bin/sstableloader| 1 + bin/sstablescrub | 1 + bin/sstableupgrade | 1 + tools/bin/cassandra-stress | 4 +++- tools/bin/cassandra-stressd | 4 +++- tools/bin/cassandra.in.sh| 4 tools/bin/json2sstable | 1 + tools/bin/sstable2json | 1 + tools/bin/sstablelevelreset | 1 + tools/bin/sstablemetadata| 1 + tools/bin/sstablerepairedset | 1 + tools/bin/sstablesplit | 1 + 19 files changed, 30 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fc8bb1e/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f73a9295 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f73a9295 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f73a9295 Branch: refs/heads/cassandra-2.1 Commit: f73a92957ba5616fbe26ffd5436004e28e4eba1b Parents: 51dfe78 dceed39 Author: Tyler Hobbs ty...@datastax.com Authored: Thu Jul 24 14:05:59 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Thu Jul 24 14:05:59 2014 -0500 -- CHANGES.txt | 2 ++ .../cassandra/cql3/statements/DropIndexStatement.java | 14 +- 2 files changed, 15 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f73a9295/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b3f644fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3f644fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3f644fe Branch: refs/heads/cassandra-2.1 Commit: b3f644fec89c3dac2fdf1e3ffeb63f38de1a30cd Parents: 62e70d2 4cdfa85 Author: Tyler Hobbs ty...@datastax.com Authored: Wed Jul 23 12:08:21 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Jul 23 12:08:21 2014 -0500 -- doc/cql3/CQL.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e64c301d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e64c301d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e64c301d Branch: refs/heads/cassandra-2.1 Commit: e64c301dd37d36d543545b7ee44c00d71a3bfd18 Parents: 22f811e e4b40c7 Author: Tyler Hobbs ty...@datastax.com Authored: Thu Jul 17 14:45:07 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Thu Jul 17 14:45:07 2014 -0500 -- CHANGES.txt | 1 + bin/cqlsh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e64c301d/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e64c301d/bin/cqlsh --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d2ae187c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2ae187c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2ae187c Branch: refs/heads/cassandra-2.1 Commit: d2ae187c7da407020b2493b73f1f281fd996ca7e Parents: c70216a 88e0571 Author: Tyler Hobbs ty...@datastax.com Authored: Wed Jul 16 11:57:23 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Jul 16 11:57:23 2014 -0500 -- CHANGES.txt | 1 + bin/cqlsh | 44 +++-- lib/cassandra-driver-internal-only-1.1.2.zip| Bin 105983 - 0 bytes ...sandra-driver-internal-only-2.1.0b1.post.zip | Bin 0 - 125786 bytes lib/licenses/cassandra-driver-1.0.2.txt | 177 --- lib/licenses/cassandra-driver-2.1.0b1.post.txt | 177 +++ lib/licenses/six-1.7.3.txt | 18 ++ lib/six-1.7.3-py2.py3-none-any.zip | Bin 0 - 9503 bytes pylib/cqlshlib/formatting.py| 8 +- pylib/cqlshlib/test/test_cqlsh_completion.py| 2 +- pylib/cqlshlib/test/test_cqlsh_output.py| 2 +- pylib/cqlshlib/usertypes.py | 117 12 files changed, 236 insertions(+), 310 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2ae187c/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2ae187c/bin/cqlsh --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85014dfb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85014dfb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85014dfb Branch: refs/heads/cassandra-2.1 Commit: 85014dfb691f37483c5c913a6a398c2c73bd86dd Parents: d2ae187 6b988fd Author: Tyler Hobbs ty...@datastax.com Authored: Wed Jul 16 15:38:08 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Jul 16 15:38:08 2014 -0500 -- doc/cql3/CQL.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57ec7b73 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57ec7b73 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57ec7b73 Branch: refs/heads/cassandra-2.1 Commit: 57ec7b7352afcd541b7b058ac5500c7682243157 Parents: 367a369 2a66119 Author: Tyler Hobbs ty...@datastax.com Authored: Wed Jul 16 17:20:24 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Jul 16 17:20:24 2014 -0500 -- CHANGES.txt | 1 + .../db/composites/BoundedComposite.java | 3 ++ .../cassandra/db/filter/ExtendedFilter.java | 22 +--- .../db/index/SecondaryIndexManager.java | 34 +- .../db/index/SecondaryIndexSearcher.java| 15 ++-- .../CompositesIndexOnCollectionValue.java | 9 - .../apache/cassandra/service/StorageProxy.java | 17 + .../cassandra/cql3/ContainsRelationTest.java| 38 8 files changed, 108 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/57ec7b73/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/57ec7b73/src/java/org/apache/cassandra/service/StorageProxy.java --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b7377fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b7377fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b7377fe Branch: refs/heads/cassandra-2.1 Commit: 0b7377fed597eb41bc23224c80747130561165cf Parents: 8a2d8a1 bd0eafd Author: Tyler Hobbs ty...@datastax.com Authored: Tue Jul 15 12:24:12 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Tue Jul 15 12:24:12 2014 -0500 -- CHANGES.txt | 1 + .../cassandra/cql3/statements/DropIndexStatement.java| 11 +++ src/java/org/apache/cassandra/transport/Event.java | 2 ++ 3 files changed, 14 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b7377fe/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fbe9630d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbe9630d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbe9630d Branch: refs/heads/cassandra-2.1 Commit: fbe9630d017c2d970f77adc8b74cce7046e58642 Parents: f9dbc10 e60b4e6 Author: Tyler Hobbs ty...@datastax.com Authored: Tue Jul 15 18:19:07 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Tue Jul 15 18:19:07 2014 -0500 -- CHANGES.txt | 1 + bin/cqlsh | 2 +- doc/cql3/CQL.textile| 137 +-- .../apache/cassandra/cql3/QueryProcessor.java | 2 +- 4 files changed, 127 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbe9630d/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbe9630d/bin/cqlsh -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbe9630d/src/java/org/apache/cassandra/cql3/QueryProcessor.java --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c70216a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c70216a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c70216a5 Branch: refs/heads/cassandra-2.1 Commit: c70216a5b323bdc1e30ae51d3316e929770c1e89 Parents: fbe9630 721afae Author: Tyler Hobbs ty...@datastax.com Authored: Tue Jul 15 18:23:10 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Tue Jul 15 18:23:10 2014 -0500 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeTool.java | 7 +-- 2 files changed, 6 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c70216a5/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/109e600f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/109e600f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/109e600f Branch: refs/heads/cassandra-2.1 Commit: 109e600fa4e2230aafd3eb90ccdb37b1bdb7a471 Parents: 40fd7f0 ae37410 Author: Jake Luciani j...@apache.org Authored: Wed Jul 9 16:22:30 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Wed Jul 9 16:22:30 2014 -0400 -- .../ic/Keyspace1/Keyspace1-Standard1-ic-0-Data.db | Bin 45000 - 0 bytes .../Keyspace1/Keyspace1-Standard1-ic-0-Digest.sha1 | 1 - .../Keyspace1/Keyspace1-Standard1-ic-0-Filter.db | Bin 1136 - 0 bytes .../ic/Keyspace1/Keyspace1-Standard1-ic-0-Index.db | Bin 15300 - 0 bytes .../Keyspace1-Standard1-ic-0-Statistics.db | Bin 4361 - 0 bytes .../Keyspace1/Keyspace1-Standard1-ic-0-Summary.db | Bin 202 - 0 bytes .../ic/Keyspace1/Keyspace1-Standard1-ic-0-TOC.txt | 7 --- .../jb/Keyspace1/Keyspace1-Standard1-jb-0-CRC.db | Bin 0 - 8 bytes .../jb/Keyspace1/Keyspace1-Standard1-jb-0-Data.db | Bin 0 - 36000 bytes .../Keyspace1/Keyspace1-Standard1-jb-0-Digest.sha1 | 1 + .../Keyspace1/Keyspace1-Standard1-jb-0-Filter.db | Bin 0 - 1136 bytes .../jb/Keyspace1/Keyspace1-Standard1-jb-0-Index.db | Bin 0 - 15300 bytes .../Keyspace1-Standard1-jb-0-Statistics.db | Bin 0 - 4395 bytes .../Keyspace1/Keyspace1-Standard1-jb-0-Summary.db | Bin 0 - 202 bytes .../jb/Keyspace1/Keyspace1-Standard1-jb-0-TOC.txt | 8 .../cassandra/io/sstable/LegacySSTableTest.java| 9 + 16 files changed, 18 insertions(+), 8 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9d2684a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9d2684a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9d2684a Branch: refs/heads/cassandra-2.1 Commit: b9d2684a89339e0290fb5db51bfb2c551f150e59 Parents: 8571fb5 eb4032e Author: Jason Brown jasobr...@apple.com Authored: Tue Jul 8 16:22:26 2014 -0700 Committer: Jason Brown jasobr...@apple.com Committed: Tue Jul 8 16:22:26 2014 -0700 -- CHANGES.txt | 1 + .../cassandra/service/ActiveRepairService.java | 22 +++- .../cassandra/service/StorageService.java | 5 - 3 files changed, 17 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9d2684a/CHANGES.txt -- diff --cc CHANGES.txt index 9e84d31,7fff2d4..b3d8a4c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,6 +1,13 @@@ +2.1.1 + * Improve schema merge performance (CASSANDRA-7444) + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + + 2.1.0-final * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505) + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521) 2.1.0-rc3
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b54c4e5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b54c4e5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b54c4e5 Branch: refs/heads/cassandra-2.1 Commit: 0b54c4e500cb16b493c360d92a2b22b1c119c8a2 Parents: aac8e6c cbe4fd0 Author: Jason Brown jasobr...@apple.com Authored: Mon Jul 7 06:34:56 2014 -0700 Committer: Jason Brown jasobr...@apple.com Committed: Mon Jul 7 06:34:56 2014 -0700 -- .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b54c4e5/src/java/org/apache/cassandra/db/compaction/CompactionManager.java --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e53152c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e53152c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e53152c Branch: refs/heads/cassandra-2.1 Commit: 4e53152c51a08a3544cbef1bc7164b2792aa6f68 Parents: 59a8504 61ee287 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Jul 7 18:22:49 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Jul 7 18:22:49 2014 +0200 -- test/unit/org/apache/cassandra/cql3/CQLTester.java | 2 -- 1 file changed, 2 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a6cdf14 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a6cdf14 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a6cdf14 Branch: refs/heads/cassandra-2.1 Commit: 9a6cdf14818d339faec18119c75d87f82544d232 Parents: a0bfdeb 2816484 Author: Marcus Eriksson marc...@apache.org Authored: Thu Jul 3 18:43:09 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Thu Jul 3 18:43:09 2014 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/CFMetaData.java | 1 - src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a6cdf14/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3be63dda Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3be63dda Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3be63dda Branch: refs/heads/cassandra-2.1 Commit: 3be63ddadd12267072aa050ca7e0164e3b629847 Parents: 9a6cdf1 92cb551 Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Jul 3 21:37:24 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Jul 3 21:37:24 2014 +0300 -- CHANGES.txt | 2 ++ doc/cql/CQL.textile | 1 - examples/client_only/conf/cassandra.yaml| 5 - pylib/cqlshlib/cql3handling.py | 3 --- src/java/org/apache/cassandra/cli/CliClient.java| 4 src/java/org/apache/cassandra/config/CFMetaData.java| 1 - src/java/org/apache/cassandra/cql/CFPropDefs.java | 3 +-- .../apache/cassandra/cql3/statements/CFPropDefs.java| 3 +-- src/resources/org/apache/cassandra/cli/CliHelp.yaml | 12 .../org/apache/cassandra/stress/settings/Legacy.java| 4 .../cassandra/stress/settings/SettingsSchema.java | 12 ++-- 11 files changed, 6 insertions(+), 44 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3be63dda/CHANGES.txt -- diff --cc CHANGES.txt index 5993d9a,01cc224..11dc135 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,6 +1,12 @@@ +2.1.1 + * Improve schema merge performance (CASSANDRA-7444) + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + 2.1.0 + * Remove left-over populate_io_cache_on_flush and replicate_on_write +uses (CASSANDRA-7493) * (Windows) handle spaces in path names (CASSANDRA-7451) * Ensure writes have completed after dropping a table, before recycling commit log segments (CASSANDRA-7437)
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/047c67ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/047c67ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/047c67ef Branch: refs/heads/cassandra-2.1 Commit: 047c67efb579607955a7637bb96ed181e7a37f56 Parents: b48d0da ea38ddc Author: Jason Brown jasobr...@apple.com Authored: Wed Jul 2 16:03:02 2014 -0700 Committer: Jason Brown jasobr...@apple.com Committed: Wed Jul 2 16:03:02 2014 -0700 -- src/java/org/apache/cassandra/streaming/StreamReader.java | 2 +- .../cassandra/streaming/compress/CompressedStreamReader.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5dc04e74 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5dc04e74 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5dc04e74 Branch: refs/heads/cassandra-2.1 Commit: 5dc04e741c9969d23210feb2e8f8cfd7b80be1ae Parents: 2774758 4c9afde Author: Jake Luciani j...@apache.org Authored: Tue Jul 1 13:37:50 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Tue Jul 1 13:37:50 2014 -0400 -- src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c70daa8e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c70daa8e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c70daa8e Branch: refs/heads/cassandra-2.1 Commit: c70daa8ed3ff70868815ed7ccd032b69bc0b5d7c Parents: 5dc04e7 3958fc4 Author: Jake Luciani j...@apache.org Authored: Tue Jul 1 14:39:47 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Tue Jul 1 14:39:47 2014 -0400 -- test/conf/cassandra.yaml | 1 + 1 file changed, 1 insertion(+) --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4f2a97a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4f2a97a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4f2a97a Branch: refs/heads/cassandra-2.1 Commit: a4f2a97ad74659de8aaa74dd0a7608503c9201c6 Parents: c70daa8 6aa81a5 Author: Jake Luciani j...@apache.org Authored: Tue Jul 1 15:26:23 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Tue Jul 1 15:26:23 2014 -0400 -- src/java/org/apache/cassandra/utils/ByteBufferUtil.java | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4f2a97a/src/java/org/apache/cassandra/utils/ByteBufferUtil.java --
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/LeveledManifest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d2133265 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2133265 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2133265 Branch: refs/heads/cassandra-2.1 Commit: d21332655f6f6d0c59160dbedb92006b8d426743 Parents: 9a0ea53 4cc4acb Author: Marcus Eriksson marc...@apache.org Authored: Mon Jun 30 16:14:14 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Mon Jun 30 16:14:14 2014 +0200 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2133265/CHANGES.txt -- diff --cc CHANGES.txt index 5711fc2,c2e5a00..c912094 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -15,10 -9,9 +15,10 @@@ Merged from 2.0 operations to incorrect become full QUORUM (CASSANDRA-7345) * Properly handle unrecognized opcodes and flags (CASSANDRA-7440) * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459) - * Make sure high level sstables get compacted (CASSANDRA-7414) * Commit disk failure policy (CASSANDRA-7429) + * Make sure high level sstables get compacted (CASSANDRA-7414) + 2.1.0-rc2 * Fix heap size calculation for CompoundSparseCellName and CompoundSparseCellName.WithCollection (CASSANDRA-7421)
