[4/4] 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/2001c257 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2001c257 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2001c257 Branch: refs/heads/cassandra-2.1 Commit: 2001c2577e4f0572596366ed1b333bff25a1a728 Parents: aca77ec8 1908ae3 Author: Tyler Hobbs ty...@datastax.com Authored: Wed Sep 3 13:05:10 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Sep 3 13:05:10 2014 -0500 -- --
[4/4] 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/40182323 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40182323 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40182323 Branch: refs/heads/cassandra-2.1 Commit: 40182323f5b052cca3e8d2bea6b808a6f85c1241 Parents: bff7572 ef89045 Author: Marcus Eriksson marc...@apache.org Authored: Mon Sep 1 15:46:48 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Mon Sep 1 15:46:48 2014 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/DataTracker.java | 12 .../apache/cassandra/db/compaction/LeveledManifest.java | 5 - .../org/apache/cassandra/io/sstable/SSTableReader.java | 5 + 4 files changed, 22 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/40182323/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/40182323/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java --
[4/4] 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/5abd129f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5abd129f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5abd129f Branch: refs/heads/cassandra-2.1 Commit: 5abd129fd9ff80aa689b830452b528f04d45eb82 Parents: 1be0bbf 049762b Author: Marcus Eriksson marc...@apache.org Authored: Wed Aug 27 13:07:16 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Wed Aug 27 13:07:16 2014 +0200 -- CHANGES.txt | 2 ++ .../org/apache/cassandra/db/ColumnIndex.java| 2 +- .../org/apache/cassandra/db/RangeTombstone.java | 8 +- .../db/compaction/LazilyCompactedRow.java | 3 ++- .../apache/cassandra/db/RangeTombstoneTest.java | 26 5 files changed, 38 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5abd129f/CHANGES.txt --
[4/4] 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/fdf293dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fdf293dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fdf293dc Branch: refs/heads/cassandra-2.1 Commit: fdf293dc1547112dc43752676635895b481288cb Parents: 11d1edc d1f38cd Author: Marcus Eriksson marc...@apache.org Authored: Tue Aug 26 15:37:10 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Tue Aug 26 15:37:10 2014 +0200 -- CHANGES.txt | 1 + .../db/compaction/LazilyCompactedRow.java | 7 +-- .../apache/cassandra/db/RangeTombstoneTest.java | 56 3 files changed, 61 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdf293dc/CHANGES.txt --
[4/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/cql3/statements/BatchStatement.java src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/94f1107e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94f1107e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94f1107e Branch: refs/heads/cassandra-2.1 Commit: 94f1107eca2f5965d6fc55ccf718a23a2f4fe2b7 Parents: 854aab7 8da1343 Author: Sylvain Lebresne sylv...@datastax.com Authored: Fri Aug 22 16:16:46 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Fri Aug 22 16:16:46 2014 +0200 -- build.xml | 2 +- tools/lib/cassandra-driver-core-2.0.4.jar | Bin 544025 - 0 bytes tools/lib/cassandra-driver-core-2.0.5.jar | Bin 0 - 544552 bytes 3 files changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/94f1107e/build.xml -- diff --cc build.xml index d747bbc,16ff03b..e678d88 --- a/build.xml +++ b/build.xml @@@ -399,16 -400,12 +399,16 @@@ dependency groupId=io.netty artifactId=netty-all version=4.0.20.Final / dependency groupId=com.google.code.findbugs artifactId=jsr305 version=2.0.2 / dependency groupId=com.clearspring.analytics artifactId=stream version=2.5.2 / - dependency groupId=com.datastax.cassandra artifactId=cassandra-driver-core version=2.0.4 / + dependency groupId=com.datastax.cassandra artifactId=cassandra-driver-core version=2.0.5 / dependency groupId=net.sf.supercsv artifactId=super-csv version=2.1.0 / +dependency groupId=net.ju-n.compile-command-annotations artifactId=compile-command-annotations version=1.2.0 / /dependencyManagement developer id=alakshman name=Avinash Lakshman/ -developer id=antelder name=Anthony Elder/ +developer id=aleksey name=Aleksey Yeschenko/ +developer id=amorton name=Aaron Morton/ +developer id=benedict name=Benedict Elliott Smith/ developer id=brandonwilliams name=Brandon Williams/ +developer id=dbrosius name=David Brosius/ developer id=eevans name=Eric Evans/ developer id=gdusbabek name=Gary Dusbabek/ developer id=goffinet name=Chris Goffinet/
[4/4] 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/edbd7d39 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edbd7d39 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edbd7d39 Branch: refs/heads/cassandra-2.1 Commit: edbd7d3922743ba0c81f61b7c3358249421f3205 Parents: 664efd4 a0923db Author: Tyler Hobbs ty...@datastax.com Authored: Thu Aug 21 14:23:17 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Thu Aug 21 14:23:17 2014 -0500 -- --
[4/4] 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/6e051257 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e051257 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e051257 Branch: refs/heads/cassandra-2.1 Commit: 6e0512576e5e920690ed1df1c920126dcb939010 Parents: ce747d7 58554de Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Aug 20 20:43:23 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Aug 20 20:43:23 2014 +0300 -- --
[4/4] 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/92325cc1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92325cc1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92325cc1 Branch: refs/heads/cassandra-2.1 Commit: 92325cc126b426005398bab67b9925bdb46affe8 Parents: 7d7d529 853e772 Author: Tyler Hobbs ty...@datastax.com Authored: Tue Aug 19 11:20:46 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Tue Aug 19 11:20:46 2014 -0500 -- --
[4/4] 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/558bb724 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/558bb724 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/558bb724 Branch: refs/heads/cassandra-2.1 Commit: 558bb7246ac56ee461b7dfc791da5876cc61ab8d Parents: 0718556 af188ed Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Aug 20 02:39:41 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Aug 20 02:39:41 2014 +0300 -- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/cql3/Constants.java| 4 ++-- src/java/org/apache/cassandra/cql3/UpdateParameters.java | 7 +++ 3 files changed, 11 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/558bb724/CHANGES.txt --
[4/4] 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/69abfaae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69abfaae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69abfaae Branch: refs/heads/cassandra-2.1 Commit: 69abfaaecf73fe47139656c7726170a2701b528c Parents: bc16517 fabdd43 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Aug 18 22:01:01 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Aug 18 22:01:01 2014 +0300 -- --
[4/4] 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/54c6e66a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54c6e66a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54c6e66a Branch: refs/heads/cassandra-2.1 Commit: 54c6e66a8d6f01945dbe05ed518e86277a4967f8 Parents: d61443e c7834d3 Author: Jake Luciani j...@apache.org Authored: Tue Aug 12 10:01:30 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Tue Aug 12 10:01:30 2014 -0400 -- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 23 +++ .../org/apache/cassandra/db/CommitLogTest.java | 30 3 files changed, 49 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/54c6e66a/CHANGES.txt --
[4/4] 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/6eb76a21 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6eb76a21 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6eb76a21 Branch: refs/heads/cassandra-2.1 Commit: 6eb76a2122c276bd252196b9ffc18764dfae4e3e Parents: 50ee3a7 ce96a2a Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Aug 11 18:24:03 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Aug 11 18:24:03 2014 +0200 -- CHANGES.txt | 3 + .../cql3/statements/AlterTableStatement.java| 23 +- .../apache/cassandra/cql3/AlterTableTest.java | 86 3 files changed, 110 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eb76a21/CHANGES.txt --
[4/4] 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/40a1cd36 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40a1cd36 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40a1cd36 Branch: refs/heads/cassandra-2.1 Commit: 40a1cd369164b0202c315309fc9fc69c448af6f5 Parents: 97e74ee cd84cc9 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Aug 6 11:10:36 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Aug 6 11:10:36 2014 +0200 -- CHANGES.txt | 1 + .../AbstractCompoundCellNameType.java | 21 +++--- .../org/apache/cassandra/cql3/CQLTester.java| 22 +++ .../apache/cassandra/cql3/UserTypesTest.java| 23 4 files changed, 59 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/40a1cd36/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/40a1cd36/src/java/org/apache/cassandra/db/composites/AbstractCompoundCellNameType.java --
[4/4] 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/6386abc0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6386abc0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6386abc0 Branch: refs/heads/cassandra-2.1 Commit: 6386abc07c8ee0ae0a3e33744fbfef5106766694 Parents: 40a1cd3 a7d950e Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Aug 6 12:13:38 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Aug 6 12:13:38 2014 +0200 -- CHANGES.txt | 1 + .../org/apache/cassandra/service/EmbeddedCassandraService.java | 5 + 2 files changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6386abc0/CHANGES.txt --
[4/4] 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/3faf88cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3faf88cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3faf88cd Branch: refs/heads/cassandra-2.1 Commit: 3faf88cd0769e7689561cef0a210fb14fa84aac0 Parents: a182ea0 a09e53c Author: Tyler Hobbs ty...@datastax.com Authored: Fri Aug 1 15:47:23 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Fri Aug 1 15:47:23 2014 -0500 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/CFMetaData.java | 10 +- 2 files changed, 6 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3faf88cd/CHANGES.txt --
[4/4] 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/cc18e05c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc18e05c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc18e05c Branch: refs/heads/cassandra-2.1 Commit: cc18e05cea6d378ed0169e27bd02556543dd120d Parents: e96b259 ff99244 Author: Tyler Hobbs ty...@datastax.com Authored: Wed Jul 30 17:13:54 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Jul 30 17:13:54 2014 -0500 -- doc/native_protocol_v3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[4/4] 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/51dfe782 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51dfe782 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51dfe782 Branch: refs/heads/cassandra-2.1 Commit: 51dfe78218f33a137eb858b43e9a8462d650c42f Parents: 7f571b5 33719e7 Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Jul 24 20:38:50 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Jul 24 20:39:58 2014 +0300 -- CHANGES.txt | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/51dfe782/CHANGES.txt -- diff --cc CHANGES.txt index adb4142,3776319..d9f82f2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,4 +1,17 @@@ +2.1.1 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Fail to start if commit log replay detects a problem (CASSANDRA-7125) + * 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: + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) ++ ++ + 2.1.0-final * Fix native protocol drop user type notification (CASSANDRA-7571) * Give read access to system.schema_usertypes to all authenticated users (CASSANDRA-7578)
