Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da94781a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da94781a
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 6bd402d12 -> da94781a2
Test bind parameters and unset parameters in InsertUpdateIfConditionTest
patch by Benjamin Lerer; reviewed by Alex Petrov for CASSANDRA-12980
Project:
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da94781a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da94781a
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 dd415263c -> 9a5aef09f
Test bind parameters and unset parameters in InsertUpdateIfConditionTest
patch by Benjamin Lerer; reviewed by Alex Petrov for CASSANDRA-12980
Project:
Repository: cassandra
Updated Branches:
refs/heads/trunk af922ca6c -> adadd7761
Fix CQLSH parser syntax (follow-up CASSANDRA-11935)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8884302f
Tree:
Merge branch cassandra-3.X into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/adadd776
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adadd776
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X 5de016fd7 -> 8884302fa
Fix CQLSH parser syntax (follow-up CASSANDRA-11935)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8884302f
Tree:
Repository: cassandra
Updated Branches:
refs/heads/trunk 5af71cf69 -> af922ca6c
ninja fix: for eclipse 4.5.1 compilation issue
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5de016fd
Tree:
Merge branch cassandra-3.X into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af922ca6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af922ca6
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X 25653baab -> 5de016fd7
ninja fix: for eclipse 4.5.1 compilation issue
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5de016fd
Tree:
Merge branch cassandra-3.X into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f782f148
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f782f148
Diff:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b3de2f4/src/java/org/apache/cassandra/cql3/functions/OperationFcts.java
--
diff --git a/src/java/org/apache/cassandra/cql3/functions/OperationFcts.java
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b3de2f4/src/java/org/apache/cassandra/db/marshal/DecimalType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/DecimalType.java
Add support for arithmetic operators
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-11935
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b3de2f4
Tree:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b3de2f4/src/java/org/apache/cassandra/db/marshal/DecimalType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/DecimalType.java
Repository: cassandra
Updated Branches:
refs/heads/trunk 58cf4c907 -> f782f148b
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b3de2f4/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java
--
Add support for arithmetic operators
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-11935
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b3de2f4
Tree:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b3de2f4/src/java/org/apache/cassandra/cql3/functions/OperationFcts.java
--
diff --git a/src/java/org/apache/cassandra/cql3/functions/OperationFcts.java
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X 075539a5b -> 8b3de2f49
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b3de2f4/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 [created] 075539a5b
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 [deleted] 075539a5b
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 [created] 075539a5b
Repository: cassandra
Updated Branches:
refs/heads/trunk 53731dfe2 -> 7c0d161b9
Fix CommitLogSegmentManagerTest
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-12283
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge cassandra-3.X into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7c0d161b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c0d161b
Diff:
Merge branch cassandra-3.0 into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/699fa9a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/699fa9a9
Diff:
Merge branch cassandra-3.0 into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/699fa9a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/699fa9a9
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X a345a810f -> 699fa9a9d
Fix CommitLogSegmentManagerTest
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-12283
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 83639d494 -> 77eee181c
Fix CommitLogSegmentManagerTest
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-12283
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/472f6161
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/472f6161
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk b6cb2ab6b -> 1eea75bcc
Fix Util.spinAssertEquals
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-12283
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Fix CommitLogSegmentManagerTest
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-12283
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ae31392
Tree:
Merge branch cassandra-3.0 into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/875c1076
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/875c1076
Diff:
Merge branch cassandra-3.X into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1eea75bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1eea75bc
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X 875c10767 -> 8ae31392d
Fix CommitLogSegmentManagerTest
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-12283
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch cassandra-3.0 into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/875c1076
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/875c1076
Diff:
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/472f6161
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/472f6161
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X bc78a2afa -> 875c10767
Fix Util.spinAssertEquals
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-12283
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/472f6161
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/472f6161
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 92594d8b8 -> 472f61613
Fix Util.spinAssertEquals
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-12283
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 cbebb29ad -> 3de6e9d32
Fix Util.spinAssertEquals
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-12283
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch cassandra-3.X into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25057330
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25057330
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk 4c728d2e4 -> 250573302
Use non-token restrictions for bounds when token restrictions are overridden
patch by Alex Petrov; reviewed by Benjamin Lerer for CASSANDRA-12149
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X 8644aa9b8 -> b98a40605
Use non-token restrictions for bounds when token restrictions are overridden
patch by Alex Petrov; reviewed by Benjamin Lerer for CASSANDRA-12149
Project:
Repository: cassandra
Updated Branches:
refs/heads/trunk 9d4fd903f -> 4c728d2e4
Use different build directories for Eclipse and Ant
patch by Stefan Podkowinski; reviewed by Benjamin Lerer for CASSANDRA-12466
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch cassandra-3.X into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c728d2e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c728d2e
Diff:
Fix CQLSH auto completion for PER PARTITION LIMIT
patch by Benjamin Lerer; reviewed by Robert Stupp for CASSANDRA-12803
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8644aa9b
Tree:
Fix CQLSH auto completion for PER PARTITION LIMIT
patch by Benjamin Lerer; reviewed by Robert Stupp for CASSANDRA-12803
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8644aa9b
Tree:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X 13b736249 -> 8644aa9b8
Use different build directories for Eclipse and Ant
patch by Stefan Podkowinski; reviewed by Benjamin Lerer for CASSANDRA-12466
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch cassandra-3.X into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65405b9e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65405b9e
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk 0695307d8 -> 65405b9ed
Upgrade commons-codec to 1.9
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko for CASSANDRA-12790
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X 78f180714 -> af1afef56
Upgrade commons-codec to 1.9
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko for CASSANDRA-12790
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/trunk bfd57d13b -> b0fdab4e4
Add duration data type
patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-11873
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge remote-tracking branch 'asf/cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b0fdab4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0fdab4e
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk 42e0fc5ee -> bfd57d13b
Add duration data type
patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-11873
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X c6ec31bad -> ecf05b882
Add duration data type
patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-11873
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/trunk 9f1674926 -> dffe27077
Exit query parsing upon first error
patch by Berenguer Blasi; reviewed by Benjamin Lerer for CASSANDRA-12598
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch cassandra-3.X into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dffe2707
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dffe2707
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X e0a35e585 -> 830954304
Exit query parsing upon first error
patch by Berenguer Blasi; reviewed by Benjamin Lerer for CASSANDRA-12598
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 b7da0031f -> b7fc5dc1c
Make Collections deserialization more robust
patch by Benjamin Lerer; reviewed by Alex Petrov for CASSANDRA-12618
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch cassandra-3.0 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bef4185
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bef4185
Diff:
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7fc5dc1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7fc5dc1
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk 577701336 -> 7bef41856
Make Collections deserialization more robust
patch by Benjamin Lerer; reviewed by Alex Petrov for CASSANDRA-12618
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7fc5dc1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7fc5dc1
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 e9fe96f40 -> 6dc595dd2
Make Collections deserialization more robust
patch by Benjamin Lerer; reviewed by Alex Petrov for CASSANDRA-12618
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/trunk bddfd643b -> cfa90c065
Add +=/-= shortcut syntax for update queries
patch by Alex Petrov; reviewed by Benjamin Lerer for CASSANDRA-12232
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/trunk 64f12ab2c -> 3f49c328f
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f49c328/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java
--
diff --git
Allow filtering on partition key columns for queries without secondary indexes
patch by ZhaoYang and Alex Petrov; reviewed by Benjamin Lerer for
CASSANDRA-11031
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f49c328/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
--
diff --git
a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
Merge branch cassandra-3.9 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4354db24
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4354db24
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk f0b229afb -> 4354db24c
Fix paging for 2.x to 3.x upgrades
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-11195
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Fix paging for 2.x to 3.x upgrades
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-11195
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c11c7d73
Tree:
Merge branch cassandra-3.0 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/301d5ef5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/301d5ef5
Diff:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.9 6facdf0be -> c11c7d73d
Fix paging for 2.x to 3.x upgrades
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-11195
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 893fd21b5 -> 932f3ebbe
Fix paging for 2.x to 3.x upgrades
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-11195
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Repository: cassandra
Updated Branches:
refs/heads/trunk d1bd71c4e -> e83f9e69e
Allow TTL with null value on insert and update
patch by Russell Spitzer; reviewed by Benjamin Lerer for CASSANDRA-12216
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9583b6b3/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java
--
diff --cc
Merge branch cassandra-3.0 into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb97649f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb97649f
Diff:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9583b6b3/test/unit/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSetTest.java
--
diff --cc
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9583b6b3/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb56193a/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
--
diff --cc
test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
index
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9583b6b3/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
--
diff --cc
test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
index
Merge branch cassandra-3.9 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1bd71c4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1bd71c4
Diff:
Merge branch cassandra-2.1 into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9583b6b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9583b6b3
Diff:
Repository: cassandra
Updated Branches:
refs/heads/trunk e22170e99 -> d1bd71c4e
Fix queries with empty ByteBuffer values in clustering column restrictions
patch by Benjamin Lerer; reviewed by jason Brown and Tyler Hobbs for
CASSANDRA-12127
Project:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb56193a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderByTest.java
--
diff --cc
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb56193a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb56193a
Diff:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9583b6b3/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java
--
diff --cc
src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb56193a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb56193a
Diff:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9583b6b3/test/unit/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSetTest.java
--
diff --cc
Merge branch cassandra-3.0 into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb97649f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb97649f
Diff:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb56193a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderByTest.java
--
diff --cc
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9583b6b3/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
--
diff --cc
test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
index
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb56193a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb56193a
Diff:
Merge branch cassandra-2.1 into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9583b6b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9583b6b3
Diff:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb56193a/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
--
diff --cc
test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java
index
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9583b6b3/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java
--
diff --cc
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.9 de2c449b7 -> cb97649f5
Fix queries with empty ByteBuffer values in clustering column restrictions
patch by Benjamin Lerer; reviewed by jason Brown and Tyler Hobbs for
CASSANDRA-12127
Project:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9583b6b3/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java
--
diff --cc
src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9583b6b3/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9583b6b3/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
--
diff --cc
test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
index
701 - 800 of 1554 matches
Mail list logo