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

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

Branch: refs/heads/cassandra-3.1
Commit: f0d45ea378ce010c2a5f807cd560c540a1d4ae46
Parents: d1a596a 83f8ccc
Author: Tyler Hobbs 
Authored: Fri Dec 4 11:43:22 2015 -0600
Committer: Tyler Hobbs 
Committed: Fri Dec 4 11:43:22 2015 -0600

--
 CHANGES.txt |   2 +
 .../apache/cassandra/db/rows/AbstractCell.java  |   5 +-
 .../apache/cassandra/db/rows/AbstractRow.java   |   6 +-
 .../apache/cassandra/db/view/TemporalRow.java   |   6 +-
 src/java/org/apache/cassandra/db/view/View.java |  15 +-
 .../apache/cassandra/db/view/ViewManager.java   |   4 +
 .../apache/cassandra/service/StorageProxy.java  |  14 +-
 .../apache/cassandra/cql3/ViewSchemaTest.java   | 762 +++
 .../org/apache/cassandra/cql3/ViewTest.java | 707 +
 9 files changed, 838 insertions(+), 683 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0d45ea3/CHANGES.txt
--
diff --cc CHANGES.txt
index 87d2e82,c22d138..7c7e301
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,6 +1,7 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Handle single-column deletions correction in materialized views
+when the column is part of the view primary key (CASSANDRA-10796)
   * Fix issue with datadir migration on upgrade (CASSANDRA-10788)
   * Fix bug with range tombstones on reverse queries and test coverage for
 AbstractBTreePartition (CASSANDRA-10059)

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

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

Branch: refs/heads/cassandra-3.1
Commit: ca32e053681d804b50b9804fe0c4a92596a8f291
Parents: 3e53152 1cbd827
Author: Robert Stupp 
Authored: Tue Dec 1 10:40:38 2015 +0100
Committer: Robert Stupp 
Committed: Tue Dec 1 10:40:38 2015 +0100

--
 bin/cqlsh.py | 11 ---
 pylib/cqlshlib/helptopics.py | 25 -
 2 files changed, 32 insertions(+), 4 deletions(-)
--

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

2015-11-27 Thread 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/17e13e5c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17e13e5c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17e13e5c

Branch: refs/heads/cassandra-3.1
Commit: 17e13e5cf5aaf45c403a96de8d38cda091c20d2e
Parents: 21a7a1c c35af2a
Author: Benjamin Lerer 
Authored: Fri Nov 27 13:17:29 2015 +0100
Committer: Benjamin Lerer 
Committed: Fri Nov 27 13:17:46 2015 +0100

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/io/sstable/format/big/BigTableWriter.java   | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)
--


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

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

2015-11-27 Thread 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/918bc011
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/918bc011
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/918bc011

Branch: refs/heads/cassandra-3.1
Commit: 918bc0116db701976ad9d0847b3b5c6a051fbbd8
Parents: b5fb573 9a2fd8c
Author: Robert Stupp 
Authored: Fri Nov 27 15:26:08 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 27 15:26:08 2015 +0100

--
 CHANGES.txt  |1 +
 bin/cqlsh.py |   62 ++-
 build.xml|7 +-
 conf/cqlshrc.sample  |   17 +
 debian/rules |3 +-
 pylib/cqlshlib/helptopics.py | 1078 -
 6 files changed, 188 insertions(+), 980 deletions(-)
--


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

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

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

2015-11-27 Thread 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/c29279ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c29279ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c29279ca

Branch: refs/heads/cassandra-3.1
Commit: c29279ca728407edc2e16f0351dc283a31150359
Parents: 9631ac1 489d647
Author: Robert Stupp 
Authored: Fri Nov 27 09:21:37 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 27 09:21:37 2015 +0100

--
 CHANGES.txt  | 1 +
 doc/cql3/CQL.textile | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


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

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

2015-11-27 Thread 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/55bf08a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55bf08a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55bf08a5

Branch: refs/heads/cassandra-3.1
Commit: 55bf08a5a5087bb0fa2cfe42bafe55a789844f78
Parents: 41f3cad c7724e6
Author: Robert Stupp 
Authored: Fri Nov 27 11:42:41 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 27 11:42:41 2015 +0100

--
 .../cassandra/hadoop/cql3/CqlRecordWriter.java  | 160 +++
 1 file changed, 92 insertions(+), 68 deletions(-)
--

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

2015-11-23 Thread 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/23a84f0d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23a84f0d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23a84f0d

Branch: refs/heads/cassandra-3.1
Commit: 23a84f0d28c3e1121e493152974c7bb507775d3b
Parents: 32a682a 174a0aa
Author: Robert Stupp 
Authored: Mon Nov 23 16:48:53 2015 +0100
Committer: Robert Stupp 
Committed: Mon Nov 23 16:48:53 2015 +0100

--
 CHANGES.txt |  1 +
 .../cql3/functions/JavaBasedUDFunction.java | 15 +
 .../cql3/functions/UDFByteCodeVerifier.java | 21 ++-
 .../cassandra/cql3/functions/UDFunction.java|  6 ++
 .../cql3/validation/entities/UFTest.java| 42 -
 .../validation/entities/UFVerifierTest.java | 62 +++-
 6 files changed, 128 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/23a84f0d/CHANGES.txt
--
diff --cc CHANGES.txt
index 6c879a4,4182cc1..1a46cb3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * 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
 of single-row deletions (CASSANDRA-10694)

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

2015-11-20 Thread 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/3944775e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3944775e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3944775e

Branch: refs/heads/cassandra-3.1
Commit: 3944775e7703a0497da03fd4f11d051dd8f2d24a
Parents: 7a48a7d 0c04a6b
Author: Sylvain Lebresne 
Authored: Fri Nov 20 13:16:31 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 20 13:16:31 2015 +0100

--
 build.xml | 34 --
 1 file changed, 28 insertions(+), 6 deletions(-)
--


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

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

2015-11-20 Thread 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/32a682a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32a682a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32a682a5

Branch: refs/heads/cassandra-3.1
Commit: 32a682a5f26e917a8085c8407cadf91c1ca9cbe8
Parents: f3fcdd7 6ac831f
Author: Robert Stupp 
Authored: Fri Nov 20 17:24:50 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 20 17:24:50 2015 +0100

--
 build.xml   | 180 +-
 ide/idea-iml-file.xml   |  68 
 ide/idea/inspectionProfiles/Project_Default.xml |  38 +-
 ide/idea/misc.xml   |   4 +
 ide/idea/vcs.xml|   6 +
 ide/idea/workspace.xml  | 359 +++
 6 files changed, 447 insertions(+), 208 deletions(-)
--


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

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

2015-11-19 Thread 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/d1103f5a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1103f5a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1103f5a

Branch: refs/heads/cassandra-3.1
Commit: d1103f5ab96f732489711903228de7106d0d80a0
Parents: 7c68abc 46da70e
Author: Robert Stupp 
Authored: Thu Nov 19 10:42:19 2015 +0100
Committer: Robert Stupp 
Committed: Thu Nov 19 10:42:19 2015 +0100

--
 conf/cassandra.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

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

Branch: refs/heads/cassandra-3.1
Commit: 6688911f4a484ac2472fa3179f10358905cb9af8
Parents: e11bd0f 464f8f0
Author: blerer 
Authored: Thu Nov 12 21:13:12 2015 +0100
Committer: blerer 
Committed: Thu Nov 12 21:13:29 2015 +0100

--
 CHANGES.txt|  1 +
 .../cassandra/db/marshal/SimpleDateType.java   |  2 +-
 .../cql3/validation/operations/AlterTest.java  | 17 +
 3 files changed, 19 insertions(+), 1 deletion(-)
--


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

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

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

Branch: refs/heads/cassandra-3.1
Commit: 11b073e6313e5284d69b3037d3f1e4bd5de1e4ba
Parents: ffe48ec d00fcbc
Author: Aleksey Yeschenko 
Authored: Tue Nov 10 16:33:03 2015 +
Committer: Aleksey Yeschenko 
Committed: Tue Nov 10 16:33:03 2015 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/11b073e6/CHANGES.txt
--
diff --cc CHANGES.txt
index e0c4e2b,ef21f9f..b6ab144
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,7 +1,8 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
   * Updated trigger example (CASSANDRA-10257)
  Merged from 2.2:
+  * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
  Merged from 2.1:
   * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258)