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

[slebresne]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: fd5cb43da87f0dd5e4c8e3e80ec293bcaa23d0fb
Parents: 29c653d 1e978df
Author: Sylvain Lebresne 
Authored: Fri Dec 4 10:10:20 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Dec 4 10:10:20 2015 +0100

--
 CHANGES.txt |   2 +
 .../apache/cassandra/db/RangeTombstoneList.java |  47 +-
 .../apache/cassandra/utils/SearchIterator.java  |   3 +-
 test/unit/org/apache/cassandra/Util.java|  23 +
 .../partition/PartitionImplementationTest.java  | 524 +++
 5 files changed, 566 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd5cb43d/CHANGES.txt
--
diff --cc CHANGES.txt
index bb8653c,2527c43..7a6076b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,6 +1,7 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Fix bug with range tombstones on reverse queries and test coverage for
+AbstractBTreePartition (CASSANDRA-10059)
   * Remove 64k limit on collection elements (CASSANDRA-10374)
   * Remove unclear Indexer.indexes() method (CASSANDRA-10690)
   * Fix NPE on stream read error (CASSANDRA-10771)

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

[marcuse]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: d1a596a4ad6717f03917877fc50714bafa55de97
Parents: fd5cb43 d0da9e7
Author: Marcus Eriksson 
Authored: Fri Dec 4 14:27:14 2015 +0100
Committer: Marcus Eriksson 
Committed: Fri Dec 4 14:27:14 2015 +0100

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/SystemKeyspace.java | 10 +---
 .../apache/cassandra/db/SystemKeyspaceTest.java | 27 ++--
 3 files changed, 33 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1a596a4/CHANGES.txt
--
diff --cc CHANGES.txt
index 7a6076b,520afff..87d2e82
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Fix issue with datadir migration on upgrade (CASSANDRA-10788)
   * Fix bug with range tombstones on reverse queries and test coverage for
 AbstractBTreePartition (CASSANDRA-10059)
   * Remove 64k limit on collection elements (CASSANDRA-10374)

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

[tylerhobbs]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: 71e83f35fe5c97d87bdcd217374160b5eaf59096
Parents: e092873 587fd9f
Author: Tyler Hobbs 
Authored: Fri Dec 4 15:38:17 2015 -0600
Committer: Tyler Hobbs 
Committed: Fri Dec 4 15:38:17 2015 -0600

--
 test/unit/org/apache/cassandra/cql3/CQLTester.java | 4 ++--
 test/unit/org/apache/cassandra/cql3/ViewTest.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--

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

[jake]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: 5b9f8eb3980f8614bc897a14c11ed9cc9c6747b7
Parents: ee46dfb cf56770
Author: T Jake Luciani 
Authored: Fri Dec 4 15:57:16 2015 -0500
Committer: T Jake Luciani 
Committed: Fri Dec 4 15:57:16 2015 -0500

--

--

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

[jake]

Merge branch 'cassandra-3.0' into cassandra-3.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/ee46dfbf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee46dfbf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee46dfbf

Branch: refs/heads/trunk
Commit: ee46dfbf934fc91d8d4865bef174b68174790edd
Parents: 2b8cdc2 c184e8c
Author: T Jake Luciani 
Authored: Fri Dec 4 15:53:44 2015 -0500
Committer: T Jake Luciani 
Committed: Fri Dec 4 15:53:44 2015 -0500

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/view/ViewUtils.java | 25 ++--
 .../apache/cassandra/service/StorageProxy.java  | 67 
 .../apache/cassandra/db/view/ViewUtilsTest.java | 42 ++--
 4 files changed, 88 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee46dfbf/CHANGES.txt
--
diff --cc CHANGES.txt
index e06653f,b95aa76..a2e9434
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Avoid MV race during node decommission (CASSANDRA-10674)
   * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
   * Handle single-column deletions correction in materialized views
 when the column is part of the view primary key (CASSANDRA-10796)

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

[slebresne]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: b815c781a4334b5c4417a8b6a58ba857867130e0
Parents: ebb1f8d fffa6d8
Author: Sylvain Lebresne 
Authored: Thu Dec 3 15:01:44 2015 +0100
Committer: Sylvain Lebresne 
Committed: Thu Dec 3 15:01:44 2015 +0100

--
 CHANGES.txt |  1 +
 NEWS.txt|  3 +
 src/java/org/apache/cassandra/index/Index.java  | 20 +++---
 .../cassandra/index/SecondaryIndexManager.java  | 65 +---
 .../index/internal/CassandraIndex.java  | 26 +---
 .../org/apache/cassandra/index/StubIndex.java   |  6 +-
 .../index/internal/CustomCassandraIndex.java| 10 ++-
 7 files changed, 62 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b815c781/CHANGES.txt
--
diff --cc CHANGES.txt
index b88c80e,507a709..f4020a0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Remove unclear Indexer.indexes() method (CASSANDRA-10690)
   * Fix NPE on stream read error (CASSANDRA-10771)
   * Normalize cqlsh DESC output (CASSANDRA-10431)
   * Rejects partition range deletions when columns are specified 
(CASSANDRA-10739)

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

[blerer]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: 2a33c3b192f405cc96fc2aa833f9534028ff707a
Parents: fca24e1 bc9a61f
Author: Benjamin Lerer 
Authored: Thu Dec 3 22:56:07 2015 +0100
Committer: Benjamin Lerer 
Committed: Thu Dec 3 22:56:07 2015 +0100

--
 CHANGES.txt |   1 +
 src/java/org/apache/cassandra/cql3/Lists.java   |  13 --
 src/java/org/apache/cassandra/cql3/Maps.java|  17 +-
 src/java/org/apache/cassandra/cql3/Sets.java|   7 -
 .../validation/entities/CollectionsTest.java| 166 +++
 .../entities/FrozenCollectionsTest.java |  98 +++
 6 files changed, 266 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a33c3b1/CHANGES.txt
--
diff --cc CHANGES.txt
index 295b444,f6aed18..bb8653c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Remove 64k limit on collection elements (CASSANDRA-10374)
   * Remove unclear Indexer.indexes() method (CASSANDRA-10690)
   * Fix NPE on stream read error (CASSANDRA-10771)
   * Normalize cqlsh DESC output (CASSANDRA-10431)

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

[tylerhobbs]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: 29c653de66b689939ea21f56080f88f6f3946dc6
Parents: 2a33c3b 814bc70
Author: Tyler Hobbs 
Authored: Thu Dec 3 17:29:48 2015 -0600
Committer: Tyler Hobbs 
Committed: Thu Dec 3 17:29:48 2015 -0600

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

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

[blerer]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: ac60e7dd6390fbac3027975e76e96ee9cbbb7332
Parents: 02492f7 bcdbb0e
Author: Benjamin Lerer 
Authored: Wed Dec 2 11:27:43 2015 +0100
Committer: Benjamin Lerer 
Committed: Wed Dec 2 11:27:43 2015 +0100

--
 CHANGES.txt  | 1 +
 bin/cqlsh.py | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac60e7dd/CHANGES.txt
--
diff --cc CHANGES.txt
index 0ba19c3,1b7f3a2..a4a77ad
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Normalize cqlsh DESC output (CASSANDRA-10431)
   * Rejects partition range deletions when columns are specified 
(CASSANDRA-10739)
   * Fix error when saving cached key for old format sstable (CASSANDRA-10778)
   * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)

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

[blerer]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: 60aeef3d663d18243b19e56b9f1f9d95a1d28908
Parents: 924fb4d 3864b21
Author: Benjamin Lerer 
Authored: Tue Dec 1 18:14:58 2015 +0100
Committer: Benjamin Lerer 
Committed: Tue Dec 1 18:14:58 2015 +0100

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/cql3/statements/DeleteStatement.java| 6 ++
 .../cassandra/cql3/validation/operations/DeleteTest.java | 8 
 3 files changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/60aeef3d/CHANGES.txt
--
diff --cc CHANGES.txt
index 99777ec,7fffbbf..ed66b69
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Rejects partition range deletions when columns are specified 
(CASSANDRA-10739)
   * Fix error when saving cached key for old format sstable (CASSANDRA-10778)
   * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)
   * Fix SELECT statement with IN restrictions on partition key,

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

[slebresne]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: 3e5315277c85cf6abdaea7b733ec346216ca730a
Parents: b2b4f15 4378b58
Author: Sylvain Lebresne 
Authored: Tue Dec 1 10:28:10 2015 +0100
Committer: Sylvain Lebresne 
Committed: Tue Dec 1 10:28:10 2015 +0100

--
 CHANGES.txt  |  1 +
 .../apache/cassandra/service/CacheService.java   |  4 
 .../cassandra/io/sstable/LegacySSTableTest.java  | 19 ++-
 3 files changed, 23 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e531527/CHANGES.txt
--
diff --cc CHANGES.txt
index 57769db,bd14e67..99777ec
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Fix error when saving cached key for old format sstable (CASSANDRA-10778)
   * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)
   * Fix SELECT statement with IN restrictions on partition key,
 ORDER BY and LIMIT (CASSANDRA-10729)

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

[jake]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: 924fb4d50892707f86ee6939a3dd3f3dd47c3bce
Parents: ca32e05 2af4fba
Author: T Jake Luciani 
Authored: Tue Dec 1 11:22:48 2015 -0500
Committer: T Jake Luciani 
Committed: Tue Dec 1 11:22:48 2015 -0500

--
 tools/stress/src/org/apache/cassandra/stress/StressProfile.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

[jake]

Merge branch 'cassandra-3.0' into cassandra-3.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/af089f6f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af089f6f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af089f6f

Branch: refs/heads/trunk
Commit: af089f6fff9bc9587f6467a50ae6ad1634040193
Parents: 8e1b6ea a0076e7
Author: T Jake Luciani 
Authored: Wed Nov 25 09:04:29 2015 -0500
Committer: T Jake Luciani 
Committed: Wed Nov 25 09:04:29 2015 -0500

--
 CHANGES.txt |  1 +
 .../cassandra/stress/settings/SettingsMode.java | 22 +
 .../cassandra/stress/util/JavaDriverClient.java | 26 +---
 3 files changed, 40 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/af089f6f/CHANGES.txt
--
diff --cc CHANGES.txt
index 75922bf,513e682..9f6a027
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Improve stress performance over 1k threads (CASSANDRA-7217)
   * Wait for migration responses to complete before bootstrapping 
(CASSANDRA-10731)
   * Unable to create a function with argument of type Inet (CASSANDRA-10741)
   * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)

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

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: 8feb66e6fb57521a831a1a6627eb7e0e52462fd4
Parents: 521cc54 ae315b5
Author: Aleksey Yeschenko 
Authored: Tue Nov 24 23:24:13 2015 +
Committer: Aleksey Yeschenko 
Committed: Tue Nov 24 23:24:13 2015 +

--
 CHANGES.txt |  1 +
 .../cassandra/service/MigrationManager.java | 24 --
 .../apache/cassandra/service/MigrationTask.java | 26 
 .../cassandra/service/StorageService.java   |  9 +++
 4 files changed, 53 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8feb66e6/CHANGES.txt
--
diff --cc CHANGES.txt
index 038840a,116d4c3..75922bf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Wait for migration responses to complete before bootstrapping 
(CASSANDRA-10731)
   * Unable to create a function with argument of type Inet (CASSANDRA-10741)
   * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)
   * Correctly preserve deletion info on updated rows when notifying indexers

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

[slebresne]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: c37dbdbe35759b0b3df5955d7ec4e84fd422d34d
Parents: 383eb46 9dac99f
Author: Sylvain Lebresne 
Authored: Tue Nov 24 14:50:49 2015 +0100
Committer: Sylvain Lebresne 
Committed: Tue Nov 24 14:50:49 2015 +0100

--
 test/unit/org/apache/cassandra/service/QueryPagerTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--

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

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: 383eb46b33de0ce6a9f0d493a4fa88f8793a7e02
Parents: e8737fd c7e74f3
Author: Aleksey Yeschenko 
Authored: Mon Nov 23 20:24:05 2015 +
Committer: Aleksey Yeschenko 
Committed: Mon Nov 23 20:24:05 2015 +

--
 .../org/apache/cassandra/schema/KeyspaceParams.java  |  5 +
 .../apache/cassandra/schema/ReplicationParams.java   | 15 +++
 .../cassandra/schema/LegacySchemaMigratorTest.java   |  3 +++
 3 files changed, 23 insertions(+)
--

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

[slebresne]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: f3fcdd7cba1d78093e887bae4dff28ed79497391
Parents: 4b364ec fee9791
Author: Sylvain Lebresne 
Authored: Fri Nov 20 15:21:16 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 20 15:21:16 2015 +0100

--
 CHANGES.txt|  1 +
 .../cassandra/hadoop/cql3/CqlConfigHelper.java | 17 -
 2 files changed, 17 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3fcdd7c/CHANGES.txt
--
diff --cc CHANGES.txt
index 87e0dd4,e6f5406..6c879a4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)
   * Correctly preserve deletion info on updated rows when notifying indexers
 of single-row deletions (CASSANDRA-10694)
   * Notify indexers of partition delete during cleanup (CASSANDRA-10685)

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

[slebresne]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: 7a48a7dbdc86caa3cbbc8c57e31b261abd9f801e
Parents: d7138f1 d1ad796
Author: Sylvain Lebresne 
Authored: Fri Nov 20 13:10:23 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 20 13:10:23 2015 +0100

--
 build.xml | 64 +-
 1 file changed, 1 insertion(+), 63 deletions(-)
--


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

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

[slebresne]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: 51a87113311e78e536ab3632499a186d455f59b8
Parents: 798a7a8 9a78608
Author: Sylvain Lebresne 
Authored: Tue Nov 17 11:52:41 2015 +0100
Committer: Sylvain Lebresne 
Committed: Tue Nov 17 11:52:41 2015 +0100

--
 test/unit/org/apache/cassandra/SchemaLoader.java   | 2 +-
 test/unit/org/apache/cassandra/cql3/CQLTester.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
--

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

[snazy]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: 36e7677147607236ab651014ebbff4df052e76be
Parents: b3231e9 c0480d8
Author: Robert Stupp 
Authored: Mon Nov 16 17:40:05 2015 +0100
Committer: Robert Stupp 
Committed: Mon Nov 16 17:40:05 2015 +0100

--
 .../cassandra/cql3/validation/operations/AggregationTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

[tylerhobbs]

Merge branch 'cassandra-3.0' into cassandra-3.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/b3231e96
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3231e96
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3231e96

Branch: refs/heads/trunk
Commit: b3231e963c811fc7f9a049af356f30ad67853e4a
Parents: 00c31a2 c2320c9
Author: Tyler Hobbs 
Authored: Fri Nov 13 15:36:58 2015 -0600
Committer: Tyler Hobbs 
Committed: Fri Nov 13 15:36:58 2015 -0600

--
 CHANGES.txt |  2 +
 .../cassandra/index/SecondaryIndexManager.java  |  6 ++-
 .../validation/entities/SecondaryIndexTest.java | 55 
 3 files changed, 61 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3231e96/CHANGES.txt
--
diff --cc CHANGES.txt
index 6aff321,8bb67e1..9708859
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,6 +1,7 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Correctly preserve deletion info on updated rows when notifying indexers
+of single-row deletions (CASSANDRA-10694)
   * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
   * Keep the file open in trySkipCache (CASSANDRA-10669)
   * Updated trigger example (CASSANDRA-10257)

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

[aleksey]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: ffe48ec6ee9d541055208eeea2e974c158e427b2
Parents: 84fe374 fb463c7
Author: Aleksey Yeschenko 
Authored: Tue Nov 10 15:36:17 2015 +
Committer: Aleksey Yeschenko 
Committed: Tue Nov 10 15:36:17 2015 +

--
 CHANGES.txt |  2 +
 examples/triggers/README.txt| 41 ++
 examples/triggers/conf/AuditTrigger.properties  | 19 +
 examples/triggers/conf/InvertedIndex.properties | 19 -
 .../apache/cassandra/triggers/AuditTrigger.java | 71 ++
 .../cassandra/triggers/InvertedIndex.java   | 79 
 6 files changed, 120 insertions(+), 111 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffe48ec6/CHANGES.txt
--
diff --cc CHANGES.txt
index 03b8544,b8a65fd..e0c4e2b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,4 -1,5 +1,6 @@@
 -3.0.1
 +3.1
++Merged from 3.0:
+  * Updated trigger example (CASSANDRA-10257)
  Merged from 2.2:
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
  Merged from 2.1:

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

[marcuse]

Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/trunk
Commit: 6f7b38987e45875d6857bc9ec6c72671d22bf82b
Parents: 11b073e 49c9c01
Author: Marcus Eriksson 
Authored: Wed Nov 11 08:55:34 2015 +0100
Committer: Marcus Eriksson 
Committed: Wed Nov 11 08:55:34 2015 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/io/sstable/SSTableRewriter.java   |  5 +---
 .../org/apache/cassandra/utils/CLibrary.java| 29 ++--
 .../apache/cassandra/utils/CLibraryTest.java|  3 +-
 4 files changed, 17 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f7b3898/CHANGES.txt
--
diff --cc CHANGES.txt
index b6ab144,d271c95..5a1e79a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Keep the file open in trySkipCache (CASSANDRA-10669)
   * Updated trigger example (CASSANDRA-10257)
  Merged from 2.2:
   * (Hadoop) fix splits calculation (CASSANDRA-10640)