[3/3] cassandra git commit: Fix serialization of AbstractBounds

/cassandra/tree/bd7d1198 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd7d1198 Branch: refs/heads/cassandra-3.0 Commit: bd7d1198ac1e02785e912c7cfbb504ddaab6bb93 Parents: 028df72 Author: Sylvain Lebresne Authored: Wed Aug 5 12:21:24 2015 +0200 Committer: blerer Committed: Wed Aug 5 12:21

[1/3] cassandra git commit: Fix paging with static

sne Authored: Wed Aug 5 12:14:26 2015 +0200 Committer: blerer Committed: Wed Aug 5 12:18:12 2015 +0200 -- .../service/pager/AbstractQueryPager.java | 54 .../service/pager/RangeNamesQueryPager.java |

[2/3] cassandra git commit: Fix unecessary and broken (when reversed) condition

/repos/asf/cassandra/tree/028df729 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/028df729 Branch: refs/heads/cassandra-3.0 Commit: 028df729b7bc0f63359990d9cc7ebb7d653232d5 Parents: 6aa8399 Author: Sylvain Lebresne Authored: Wed Aug 5 12:19:32 2015 +0200 Committer: blerer Committed

[3/4] cassandra git commit: Fix serialization of AbstractBounds

/cassandra/tree/bd7d1198 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd7d1198 Branch: refs/heads/trunk Commit: bd7d1198ac1e02785e912c7cfbb504ddaab6bb93 Parents: 028df72 Author: Sylvain Lebresne Authored: Wed Aug 5 12:21:24 2015 +0200 Committer: blerer Committed: Wed Aug 5 12:21:24 2015

[1/4] cassandra git commit: Fix paging with static

12:14:26 2015 +0200 Committer: blerer Committed: Wed Aug 5 12:18:12 2015 +0200 -- .../service/pager/AbstractQueryPager.java | 54 .../service/pager/RangeNamesQueryPager.java | 6 +++ .../service/pa

[2/4] cassandra git commit: Fix unecessary and broken (when reversed) condition

/repos/asf/cassandra/tree/028df729 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/028df729 Branch: refs/heads/trunk Commit: 028df729b7bc0f63359990d9cc7ebb7d653232d5 Parents: 6aa8399 Author: Sylvain Lebresne Authored: Wed Aug 5 12:19:32 2015 +0200 Committer: blerer Committed: Wed Aug

[4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

/repos/asf/cassandra/diff/de49ed84 Branch: refs/heads/trunk Commit: de49ed84cf5fdd21e3215940b6b375ae77cc1774 Parents: 3ab86d0 bd7d119 Author: blerer Authored: Wed Aug 5 13:57:55 2015 +0200 Committer: blerer Committed: Wed Aug 5 13:58:29

cassandra git commit: Makes AggregationTest.testAggregateWithWriteTimeOrTTL more robust

be6 Parents: 0871533 Author: blerer Authored: Sun Aug 9 21:12:11 2015 +0200 Committer: blerer Committed: Sun Aug 9 21:12:11 2015 +0200 -- .../cql3/validation/operations/AggregationTest.java | 11 ++- 1 file changed

[1/2] cassandra git commit: Makes AggregationTest.testAggregateWithWriteTimeOrTTL more robust

be6 Parents: 0871533 Author: blerer Authored: Sun Aug 9 21:12:11 2015 +0200 Committer: blerer Committed: Sun Aug 9 21:12:11 2015 +0200 -- .../cql3/validation/operations/AggregationTest.java | 11 ++- 1 file changed

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

.org/repos/asf/cassandra/diff/8984ca79 Branch: refs/heads/cassandra-3.0 Commit: 8984ca79f1f9a0fa59642650f7145d572b0a9b9b Parents: e2ad7d5 a5297f1 Author: blerer Authored: Sun Aug 9 21:23:28 2015 +0200 Committer: blerer Committed: Sun Aug 9 21:23:50

[1/3] cassandra git commit: Makes AggregationTest.testAggregateWithWriteTimeOrTTL more robust

533 Author: blerer Authored: Sun Aug 9 21:12:11 2015 +0200 Committer: blerer Committed: Sun Aug 9 21:12:11 2015 +0200 -- .../cql3/validation/operations/AggregationTest.java | 11 ++- 1 file changed, 6 insertions(+)

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

.org/repos/asf/cassandra/diff/8984ca79 Branch: refs/heads/trunk Commit: 8984ca79f1f9a0fa59642650f7145d572b0a9b9b Parents: e2ad7d5 a5297f1 Author: blerer Authored: Sun Aug 9 21:23:28 2015 +0200 Committer: blerer Committed: Sun Aug 9 21:23:50

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

/repos/asf/cassandra/diff/680acced Branch: refs/heads/trunk Commit: 680accedb31589d81f2742febc0677159136c1f9 Parents: 98cc1ee 8984ca7 Author: blerer Authored: Sun Aug 9 21:27:00 2015 +0200 Committer: blerer Committed: Sun Aug 9 21:27:24

cassandra git commit: Allows single-column slice restrictions to be merged with multi-columns slice restrictions

mit: de84a5c770ac1a429152dd79f0895b27aa544368 Parents: c9587cd Author: blerer Authored: Sun Aug 9 21:48:04 2015 +0200 Committer: blerer Committed: Sun Aug 9 21:48:04 2015 +0200 -- .../cql3/statements/MultiColumnRestriction.java | 10 +++- .../cassan

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

.org/repos/asf/cassandra/diff/1ae58ef3 Branch: refs/heads/cassandra-2.1 Commit: 1ae58ef3acc187a3728ca0dda3e98be8b3580ec1 Parents: 07a7e80 de84a5c Author: blerer Authored: Sun Aug 9 22:04:32 2015 +0200 Committer: blerer Committed: Sun Aug 9 22:04:56 2015 +0200 -- --

[1/2] cassandra git commit: Allows single-column slice restrictions to be merged with multi-columns slice restrictions

mit: de84a5c770ac1a429152dd79f0895b27aa544368 Parents: c9587cd Author: blerer Authored: Sun Aug 9 21:48:04 2015 +0200 Committer: blerer Committed: Sun Aug 9 21:48:04 2015 +0200 -- .../cql3/statements/MultiColumnRestriction.java | 10 +++- .../cassan

cassandra git commit: Allows single-column slice restrictions to be merged with multi-columns slice restrictions

mit: c8d163f73cad4cb61c12c6871e26489b52094d17 Parents: 1ae58ef Author: blerer Authored: Sun Aug 9 22:09:48 2015 +0200 Committer: blerer Committed: Sun Aug 9 22:09:48 2015 +0200 -- .../cql3/statements/MultiColumnRestriction.java | 10 +++- .../cassan

[3/4] cassandra git commit: Allows single-column slice restrictions to be merged with multi-columns slice restrictions

/c8d163f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8d163f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8d163f7 Branch: refs/heads/cassandra-2.2 Commit: c8d163f73cad4cb61c12c6871e26489b52094d17 Parents: 1ae58ef Author: blerer Authored: Sun Aug 9 22:09:48 2015 +0200

[1/4] cassandra git commit: Allows single-column slice restrictions to be merged with multi-columns slice restrictions

mit: de84a5c770ac1a429152dd79f0895b27aa544368 Parents: c9587cd Author: blerer Authored: Sun Aug 9 21:48:04 2015 +0200 Committer: blerer Committed: Sun Aug 9 21:48:04 2015 +0200 -- .../cql3/statements/MultiColumnRestriction.java | 10 +++- .../cassan

[4/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

.org/repos/asf/cassandra/diff/6d0cf7db Branch: refs/heads/cassandra-2.2 Commit: 6d0cf7dbd2221c13434958e9e0d5e418f58fe23f Parents: 0b99d33 c8d163f Author: blerer Authored: Sun Aug 9 22:11:14 2015 +0200 Committer: blerer Committed: Sun Aug 9 22:12:16

[2/4] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

.org/repos/asf/cassandra/diff/1ae58ef3 Branch: refs/heads/cassandra-2.2 Commit: 1ae58ef3acc187a3728ca0dda3e98be8b3580ec1 Parents: 07a7e80 de84a5c Author: blerer Authored: Sun Aug 9 22:04:32 2015 +0200 Committer: blerer Committed: Sun Aug 9 22:04:56 2015 +0200 -- --

[1/5] cassandra git commit: Allows single-column slice restrictions to be merged with multi-columns slice restrictions

mit: de84a5c770ac1a429152dd79f0895b27aa544368 Parents: c9587cd Author: blerer Authored: Sun Aug 9 21:48:04 2015 +0200 Committer: blerer Committed: Sun Aug 9 21:48:04 2015 +0200 -- .../cql3/statements/MultiColumnRestriction.java | 10 +++- .../cassan

[3/5] cassandra git commit: Allows single-column slice restrictions to be merged with multi-columns slice restrictions

/c8d163f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8d163f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8d163f7 Branch: refs/heads/cassandra-3.0 Commit: c8d163f73cad4cb61c12c6871e26489b52094d17 Parents: 1ae58ef Author: blerer Authored: Sun Aug 9 22:09:48 2015 +0200

[4/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

.org/repos/asf/cassandra/diff/6d0cf7db Branch: refs/heads/cassandra-3.0 Commit: 6d0cf7dbd2221c13434958e9e0d5e418f58fe23f Parents: 0b99d33 c8d163f Author: blerer Authored: Sun Aug 9 22:11:14 2015 +0200 Committer: blerer Committed: Sun Aug 9 22:12:16

[2/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

.org/repos/asf/cassandra/diff/1ae58ef3 Branch: refs/heads/cassandra-3.0 Commit: 1ae58ef3acc187a3728ca0dda3e98be8b3580ec1 Parents: 07a7e80 de84a5c Author: blerer Authored: Sun Aug 9 22:04:32 2015 +0200 Committer: blerer Committed: Sun Aug 9 22:04:56 2015 +0200 -- --

[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

7b Parents: f568a5d 6d0cf7d Author: blerer Authored: Sun Aug 9 22:46:52 2015 +0200 Committer: blerer Committed: Sun Aug 9 22:46:52 2015 +0200 -- .../restrictions/MultiColumnRestriction.java| 37 +++ .../re

[2/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

.org/repos/asf/cassandra/diff/1ae58ef3 Branch: refs/heads/trunk Commit: 1ae58ef3acc187a3728ca0dda3e98be8b3580ec1 Parents: 07a7e80 de84a5c Author: blerer Authored: Sun Aug 9 22:04:32 2015 +0200 Committer: blerer Committed: Sun Aug 9 22:04:56 2015 +0200 -- --

[1/6] cassandra git commit: Allows single-column slice restrictions to be merged with multi-columns slice restrictions

mit: de84a5c770ac1a429152dd79f0895b27aa544368 Parents: c9587cd Author: blerer Authored: Sun Aug 9 21:48:04 2015 +0200 Committer: blerer Committed: Sun Aug 9 21:48:04 2015 +0200 -- .../cql3/statements/MultiColumnRestriction.java | 10 +++- .../cassandra/cql3/stateme

[4/6] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

.org/repos/asf/cassandra/diff/6d0cf7db Branch: refs/heads/trunk Commit: 6d0cf7dbd2221c13434958e9e0d5e418f58fe23f Parents: 0b99d33 c8d163f Author: blerer Authored: Sun Aug 9 22:11:14 2015 +0200 Committer: blerer Committed: Sun Aug 9 22:12:16

[3/6] cassandra git commit: Allows single-column slice restrictions to be merged with multi-columns slice restrictions

/c8d163f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8d163f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8d163f7 Branch: refs/heads/trunk Commit: c8d163f73cad4cb61c12c6871e26489b52094d17 Parents: 1ae58ef Author: blerer Authored: Sun Aug 9 22:09:48 2015 +0200 Committer

[6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

/repos/asf/cassandra/diff/ba56b822 Branch: refs/heads/trunk Commit: ba56b8221b5906633dc41155a6fc0a4a2b6571f7 Parents: b6d5f2c e389dc4 Author: blerer Authored: Sun Aug 9 22:50:32 2015 +0200 Committer: blerer Committed: Sun Aug 9 22:50:46

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

s: f568a5d 6d0cf7d Author: blerer Authored: Sun Aug 9 22:46:52 2015 +0200 Committer: blerer Committed: Sun Aug 9 22:46:52 2015 +0200 -- .../restrictions/MultiColumnRestriction.java| 37 +++ .../re

cassandra git commit: Fix Select * is only returning the first page of data

nts: 6e1e336 Author: blerer Authored: Mon Aug 10 15:09:03 2015 +0200 Committer: blerer Committed: Mon Aug 10 15:09:03 2015 +0200 -- .../cassandra/cql3/restrictions/StatementRestrictions.java| 4 +++- .../org/apache/cassandra/c

[1/2] cassandra git commit: Fix Select * is only returning the first page of data

ttp://git-wip-us.apache.org/repos/asf/cassandra/commit/e98be186 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e98be186 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e98be186 Branch: refs/heads/trunk Commit: e98be186d1e39c45aa34e6ea995f0bf718b99015 Parents: 6e1e336 Author: ble

[2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk

/cassandra/diff/402a12f9 Branch: refs/heads/trunk Commit: 402a12f96b4aa6d120f6a6feebd4913b6ab6460f Parents: 41c83e4 e98be18 Author: blerer Authored: Mon Aug 10 15:13:07 2015 +0200 Committer: blerer Committed: Mon Aug 10 15:13:17 2015 +0200

cassandra git commit: Fix RowAndDeletionMergeIteratorTest

hia Authored: Tue Aug 11 17:00:05 2015 +0200 Committer: blerer Committed: Tue Aug 11 17:00:05 2015 +0200 -- .../rows/RowAndDeletionMergeIteratorTest.java | 105 +++ 1 file changed, 63 insertions(+), 42 deleti

[2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk

/cassandra/diff/881776f3 Branch: refs/heads/trunk Commit: 881776f35936df8bde93117f783fa5778094c046 Parents: 8945413 dea1509 Author: blerer Authored: Tue Aug 11 17:03:12 2015 +0200 Committer: blerer Committed: Tue Aug 11 17:03:22 2015 +0200

[1/2] cassandra git commit: Fix RowAndDeletionMergeIteratorTest

Aug 11 17:00:05 2015 +0200 Committer: blerer Committed: Tue Aug 11 17:00:05 2015 +0200 -- .../rows/RowAndDeletionMergeIteratorTest.java | 105 +++ 1 file changed, 63 insertions(+), 42 deleti

cassandra git commit: Provide a per-table text->blob map for storing extra metadata

arents: 1288427 Author: blerer Authored: Fri Aug 14 18:04:34 2015 +0200 Committer: blerer Committed: Fri Aug 14 18:04:34 2015 +0200 -- .../org/apache/cassandra/config/CFMetaData.java | 6 ++ .../apache/cassandra/

[1/2] cassandra git commit: Provide a per-table text->blob map for storing extra metadata

Author: blerer Authored: Fri Aug 14 18:04:34 2015 +0200 Committer: blerer Committed: Fri Aug 14 18:04:34 2015 +0200 -- .../org/apache/cassandra/config/CFMetaData.java | 6 ++ .../apache/cassandra/schema/SchemaKeyspace.jav

[2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk

/cassandra/diff/7a4226f0 Branch: refs/heads/trunk Commit: 7a4226f0cf35c14cdbb209988a15407ca004a4d8 Parents: 7357ed0 507ed14 Author: blerer Authored: Fri Aug 14 18:08:54 2015 +0200 Committer: blerer Committed: Fri Aug 14 18:09:06 2015 +0200

cassandra git commit: Fix ordering with IN restriction on partition key

093 Author: blerer Authored: Mon Aug 17 10:58:37 2015 +0200 Committer: blerer Committed: Mon Aug 17 10:58:37 2015 +0200 -- .../restrictions/PrimaryKeyRestrictionSet.java | 2 +- .../operations/SelectOrderByTest.java |

[2/2] cassandra git commit: Merge cassandra-2.2 into cassandra-3.0

/cassandra/diff/47b66d7c Branch: refs/heads/cassandra-3.0 Commit: 47b66d7c1e22dfd063d39b6aa3874c611ef8f0b7 Parents: d2da760 ee186b6 Author: blerer Authored: Mon Aug 17 11:09:51 2015 +0200 Committer: blerer Committed: Mon Aug 17 11:10:55 2015 +0200

[1/2] cassandra git commit: Fix ordering with IN restriction on partition key

093 Author: blerer Authored: Mon Aug 17 10:58:37 2015 +0200 Committer: blerer Committed: Mon Aug 17 10:58:37 2015 +0200 -- .../restrictions/PrimaryKeyRestrictionSet.java | 2 +- .../operations/SelectOrderByTest.java |

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

/5e9835ba Branch: refs/heads/trunk Commit: 5e9835ba79e3b35715531b06536c5f10326de690 Parents: 853 47b66d7 Author: blerer Authored: Mon Aug 17 11:14:33 2015 +0200 Committer: blerer Committed: Mon Aug 17 11:14:53 2015 +0200

[2/3] cassandra git commit: Merge cassandra-2.2 into cassandra-3.0

/cassandra/diff/47b66d7c Branch: refs/heads/trunk Commit: 47b66d7c1e22dfd063d39b6aa3874c611ef8f0b7 Parents: d2da760 ee186b6 Author: blerer Authored: Mon Aug 17 11:09:51 2015 +0200 Committer: blerer Committed: Mon Aug 17 11:10:55 2015 +0200

[1/3] cassandra git commit: Fix ordering with IN restriction on partition key

git-wip-us.apache.org/repos/asf/cassandra/commit/ee186b6b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee186b6b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee186b6b Branch: refs/heads/trunk Commit: ee186b6b05569537eb979027176ccee57354c4da Parents: 31db093 Author: ble

cassandra git commit: Check column names in IN restrictions

wip-us.apache.org/repos/asf/cassandra/commit/62fc314c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62fc314c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62fc314c Branch: refs/heads/cassandra-2.2 Commit: 62fc314c582e9f218987e96c79db6c1aa0ba6c1e Parents: de2e0a6 Author: ble

[2/2] cassandra git commit: Merge cassandra-2.2 into cassandra-3.0

/cassandra/diff/be2c26f1 Branch: refs/heads/cassandra-3.0 Commit: be2c26f183b6ef9c606fab83342fff026054f5a3 Parents: c997c08 62fc314 Author: blerer Authored: Thu Aug 20 13:52:27 2015 +0200 Committer: blerer Committed: Thu Aug 20 13:53:30 2015 +0200

[1/2] cassandra git commit: Check column names in IN restrictions

wip-us.apache.org/repos/asf/cassandra/commit/62fc314c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62fc314c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62fc314c Branch: refs/heads/cassandra-3.0 Commit: 62fc314c582e9f218987e96c79db6c1aa0ba6c1e Parents: de2e0a6 Author: ble

[2/3] cassandra git commit: Merge cassandra-2.2 into cassandra-3.0

/cassandra/diff/be2c26f1 Branch: refs/heads/trunk Commit: be2c26f183b6ef9c606fab83342fff026054f5a3 Parents: c997c08 62fc314 Author: blerer Authored: Thu Aug 20 13:52:27 2015 +0200 Committer: blerer Committed: Thu Aug 20 13:53:30 2015 +0200

[1/3] cassandra git commit: Check column names in IN restrictions

org/repos/asf/cassandra/commit/62fc314c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62fc314c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62fc314c Branch: refs/heads/trunk Commit: 62fc314c582e9f218987e96c79db6c1aa0ba6c1e Parents: de2e0a6 Author: blerer Authored: Thu Aug

[3/3] cassandra git commit: Merge remote-tracking branch 'asf/cassandra-3.0' into trunk

://git-wip-us.apache.org/repos/asf/cassandra/diff/0edf5477 Branch: refs/heads/trunk Commit: 0edf54777ad18e3729c95552f5276016e00583a4 Parents: b10c00b be2c26f Author: blerer Authored: Thu Aug 20 13:55:04 2015 +0200 Committer: blerer Committed: Thu Aug 20 13:55:04

cassandra git commit: Allow count(*) and count(1) to be use as normal aggregation

nts: 62fc314 Author: blerer Authored: Thu Aug 20 14:01:37 2015 +0200 Committer: blerer Committed: Thu Aug 20 14:01:37 2015 +0200 -- NEWS.txt| 1 + src/java/org/apache/cassandra/cql3/Cq

[2/2] cassandra git commit: Merge cassandra-2.2 into cassandra-3.0

/1964a82b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1964a82b Branch: refs/heads/cassandra-3.0 Commit: 1964a82bf0dea261ccb1f48c36cda0de7fa8d62e Parents: be2c26f 4fc5851 Author: blerer Authored: Thu Aug 20 14:10:11 2015 +0200 Committer: blerer Committed: Thu Aug 20 14:10:11 2015

[1/2] cassandra git commit: Allow count(*) and count(1) to be use as normal aggregation

nts: 62fc314 Author: blerer Authored: Thu Aug 20 14:01:37 2015 +0200 Committer: blerer Committed: Thu Aug 20 14:01:37 2015 +0200 -- NEWS.txt| 1 + src/java/org/apache/cassandra/cql3/Cq

[2/3] cassandra git commit: Merge cassandra-2.2 into cassandra-3.0

/1964a82b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1964a82b Branch: refs/heads/trunk Commit: 1964a82bf0dea261ccb1f48c36cda0de7fa8d62e Parents: be2c26f 4fc5851 Author: blerer Authored: Thu Aug 20 14:10:11 2015 +0200 Committer: blerer Committed: Thu Aug 20 14:10:11 2015 +0200

[1/3] cassandra git commit: Allow count(*) and count(1) to be use as normal aggregation

hor: blerer Authored: Thu Aug 20 14:01:37 2015 +0200 Committer: blerer Committed: Thu Aug 20 14:01:37 2015 +0200 -- NEWS.txt| 1 + src/java/org/apache/cassandra/cql3/Cql.g|

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

/cassandra/diff/86bca3a0 Branch: refs/heads/trunk Commit: 86bca3a0b90cc8a1e67f0ddac9e33af63898d569 Parents: 0edf547 1964a82 Author: blerer Authored: Thu Aug 20 14:12:27 2015 +0200 Committer: blerer Committed: Thu Aug 20 14:13:23 2015 +0200

cassandra git commit: Fix multiget_slice

hor: blerer Authored: Mon Aug 24 14:38:15 2015 +0200 Committer: blerer Committed: Mon Aug 24 14:38:15 2015 +0200 -- .../apache/cassandra/thrift/CassandraServer.java | 18 +++--- 1 file changed, 15 insertions(+), 3 deleti

[2/2] cassandra git commit: Merge branch cassandra-3.0 into trunk

/cassandra/diff/99fc7d9c Branch: refs/heads/trunk Commit: 99fc7d9ce7d010c0fd5138ac7a4f14cc4fc9be1a Parents: 62f2078 706ba87 Author: blerer Authored: Mon Aug 24 14:42:43 2015 +0200 Committer: blerer Committed: Mon Aug 24 14:42:55 2015 +0200

[1/2] cassandra git commit: Fix multiget_slice

wip-us.apache.org/repos/asf/cassandra/commit/706ba876 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/706ba876 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/706ba876 Branch: refs/heads/trunk Commit: 706ba8767e7339e0af5eebf84cc61bc21883f6e0 Parents: 29d3d44 Author: blerer Autho

cassandra git commit: Change streaming_socket_timeout_in_ms default

ert Coli Authored: Wed Aug 26 15:16:47 2015 +0200 Committer: blerer Committed: Wed Aug 26 15:16:47 2015 +0200 -- CHANGES.txt | 1 + conf/cassandra.yaml | 4 ++--

[1/2] cassandra git commit: Change streaming_socket_timeout_in_ms default

ert Coli Authored: Wed Aug 26 15:16:47 2015 +0200 Committer: blerer Committed: Wed Aug 26 15:16:47 2015 +0200 -- CHANGES.txt | 1 + conf/cassandra.yaml | 4 ++--

[2/2] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

/cassandra/diff/2ac45aed Branch: refs/heads/cassandra-2.2 Commit: 2ac45aed90067c68113b9edd7b79a777f6b80e76 Parents: 1dc19a6 7e1ea4c Author: blerer Authored: Wed Aug 26 15:20:41 2015 +0200 Committer: blerer Committed: Wed Aug 26 15:22:04 2015 +0200

[1/3] cassandra git commit: Change streaming_socket_timeout_in_ms default

ert Coli Authored: Wed Aug 26 15:16:47 2015 +0200 Committer: blerer Committed: Wed Aug 26 15:16:47 2015 +0200 -- CHANGES.txt | 1 + conf/cassandra.yaml | 4 ++--

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

/cassandra/diff/c1740a21 Branch: refs/heads/cassandra-3.0 Commit: c1740a21327a4ba62e4d9b4e3c5656ffa2139d9f Parents: d3691cb 2ac45ae Author: blerer Authored: Wed Aug 26 15:23:53 2015 +0200 Committer: blerer Committed: Wed Aug 26 15:24:38 2015 +0200

[2/3] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

/cassandra/diff/2ac45aed Branch: refs/heads/cassandra-3.0 Commit: 2ac45aed90067c68113b9edd7b79a777f6b80e76 Parents: 1dc19a6 7e1ea4c Author: blerer Authored: Wed Aug 26 15:20:41 2015 +0200 Committer: blerer Committed: Wed Aug 26 15:22:04 2015 +0200

[2/5] cassandra git commit: Make sorting unconditional in followup to CASSANDRA-10162

Make sorting unconditional in followup to CASSANDRA-10162 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d3691cb4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3691cb4 Diff: http://git-wip-us.apache.org

[5/5] cassandra git commit: Merge branch cassandra-3.0 into trunk

/cassandra/diff/74f4bc33 Branch: refs/heads/trunk Commit: 74f4bc331fa8e4f9b417fb961dc5bd208b9088a1 Parents: 0f980e5 c1740a2 Author: blerer Authored: Wed Aug 26 15:26:17 2015 +0200 Committer: blerer Committed: Wed Aug 26 15:31:22 2015 +0200

[1/5] cassandra git commit: Change streaming_socket_timeout_in_ms default

red: Wed Aug 26 15:16:47 2015 +0200 Committer: blerer Committed: Wed Aug 26 15:16:47 2015 +0200 -- CHANGES.txt | 1 + conf/cassandra.yaml | 4 ++-- src/java/org/apa

[4/5] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

/cassandra/diff/c1740a21 Branch: refs/heads/trunk Commit: c1740a21327a4ba62e4d9b4e3c5656ffa2139d9f Parents: d3691cb 2ac45ae Author: blerer Authored: Wed Aug 26 15:23:53 2015 +0200 Committer: blerer Committed: Wed Aug 26 15:24:38 2015 +0200

[3/5] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

/cassandra/diff/2ac45aed Branch: refs/heads/trunk Commit: 2ac45aed90067c68113b9edd7b79a777f6b80e76 Parents: 1dc19a6 7e1ea4c Author: blerer Authored: Wed Aug 26 15:20:41 2015 +0200 Committer: blerer Committed: Wed Aug 26 15:22:04 2015 +0200

cassandra git commit: NINJA follow on 10114 - fix NEWS.txt

wip-us.apache.org/repos/asf/cassandra/tree/bc25ca10 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc25ca10 Branch: refs/heads/cassandra-2.2 Commit: bc25ca10cbfc9b732975bd768033a17d9de685b3 Parents: 2ac45ae Author: blerer Authored: Wed Aug 26 15:47:09 2015 +0200 Committer: blerer Committed: Wed

[2/2] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

/cassandra/diff/bb77e12f Branch: refs/heads/cassandra-3.0 Commit: bb77e12f00e92acf569f4fae16db66b321de4be3 Parents: c1740a2 bc25ca1 Author: blerer Authored: Wed Aug 26 15:52:03 2015 +0200 Committer: blerer Committed: Wed Aug 26 15:55:34 2015 +0200

[1/2] cassandra git commit: NINJA follow on 10114 - fix NEWS.txt

wip-us.apache.org/repos/asf/cassandra/tree/bc25ca10 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc25ca10 Branch: refs/heads/cassandra-3.0 Commit: bc25ca10cbfc9b732975bd768033a17d9de685b3 Parents: 2ac45ae Author: blerer Authored: Wed Aug 26 15:47:09 2015 +0200 Committer: blerer Committed: Wed

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

/cassandra/diff/bb77e12f Branch: refs/heads/trunk Commit: bb77e12f00e92acf569f4fae16db66b321de4be3 Parents: c1740a2 bc25ca1 Author: blerer Authored: Wed Aug 26 15:52:03 2015 +0200 Committer: blerer Committed: Wed Aug 26 15:55:34 2015 +0200

[1/3] cassandra git commit: NINJA follow on 10114 - fix NEWS.txt

pos/asf/cassandra/tree/bc25ca10 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc25ca10 Branch: refs/heads/trunk Commit: bc25ca10cbfc9b732975bd768033a17d9de685b3 Parents: 2ac45ae Author: blerer Authored: Wed Aug 26 15:47:09 2015 +0200 Committer: blerer Committed: Wed Aug 26 15:47

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

/012de8be Branch: refs/heads/trunk Commit: 012de8bed418a07a35c268426cfe3677c48c326f Parents: 74f4bc3 bb77e12 Author: blerer Authored: Wed Aug 26 15:57:24 2015 +0200 Committer: blerer Committed: Wed Aug 26 15:57:48 2015 +0200

cassandra git commit: Ninja Fix ColumnTest following up CASSANDRA-10045

git-wip-us.apache.org/repos/asf/cassandra/tree/8360f4bf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8360f4bf Branch: refs/heads/cassandra-3.0 Commit: 8360f4bf148344960dfd156f6217f7657f070365 Parents: 07dfc20 Author: blerer Authored: Fri Aug 28 15:39:54 2015 +0200 Committer: ble

[1/2] cassandra git commit: Ninja Fix ColumnTest following up CASSANDRA-10045

wip-us.apache.org/repos/asf/cassandra/tree/8360f4bf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8360f4bf Branch: refs/heads/trunk Commit: 8360f4bf148344960dfd156f6217f7657f070365 Parents: 07dfc20 Author: blerer Authored: Fri Aug 28 15:39:54 2015 +0200 Committer: blerer Committed: Fri

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

/repos/asf/cassandra/diff/bf85616f Branch: refs/heads/trunk Commit: bf85616f663f1c341cdfcddc8d0f64ee43d05f96 Parents: 20e1018 8360f4b Author: blerer Authored: Fri Aug 28 15:43:42 2015 +0200 Committer: blerer Committed: Fri Aug 28 15:43:59

cassandra git commit: consistently sort DCs in nodetool:status

ris Burroughs Authored: Fri Aug 28 16:01:10 2015 +0200 Committer: blerer Committed: Fri Aug 28 16:01:10 2015 +0200 -- src/java/org/apache/cassandra/tools/NodeTool.java | 11 ++- 1 file changed, 6 insertions(+), 5 deleti

[4/4] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

/cassandra/diff/5fb4e58b Branch: refs/heads/cassandra-2.2 Commit: 5fb4e58bc9d85f8248852982d4ef7a216967ade7 Parents: 01a11fd 264cf36 Author: blerer Authored: Fri Aug 28 16:03:16 2015 +0200 Committer: blerer Committed: Fri Aug 28 16:07:49 2015 +0200

[2/4] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fb4e58b/src/java/org/apache/cassandra/tools/nodetool/Status.java -- diff --cc src/java/org/apache/cassandra/tools/nodetool/Status.java index c4b2295,000..99f745d mode 10064

[1/4] cassandra git commit: consistently sort DCs in nodetool:status

ris Burroughs Authored: Fri Aug 28 16:01:10 2015 +0200 Committer: blerer Committed: Fri Aug 28 16:01:10 2015 +0200 -- src/java/org/apache/cassandra/tools/NodeTool.java | 11 ++- 1 file changed, 6 insertions(+), 5 deleti

[3/4] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fb4e58b/src/java/org/apache/cassandra/tools/NodeTool.java -- diff --cc src/java/org/apache/cassandra/tools/NodeTool.java index 10c0915,8e88f45..3cb51e2 --- a/src/java/org/apach

[2/5] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fb4e58b/src/java/org/apache/cassandra/tools/nodetool/Status.java -- diff --cc src/java/org/apache/cassandra/tools/nodetool/Status.java index c4b2295,000..99f745d mode 10064

[4/5] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

/cassandra/diff/5fb4e58b Branch: refs/heads/cassandra-3.0 Commit: 5fb4e58bc9d85f8248852982d4ef7a216967ade7 Parents: 01a11fd 264cf36 Author: blerer Authored: Fri Aug 28 16:03:16 2015 +0200 Committer: blerer Committed: Fri Aug 28 16:07:49 2015 +0200

[5/5] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

/cassandra/diff/efe9a7dc Branch: refs/heads/cassandra-3.0 Commit: efe9a7dc4d185a2dfe35b7a77f5bb853e323c52c Parents: b4104e1 5fb4e58 Author: blerer Authored: Fri Aug 28 16:10:09 2015 +0200 Committer: blerer Committed: Fri Aug 28 16:12:32 2015 +0200

[1/5] cassandra git commit: consistently sort DCs in nodetool:status

ris Burroughs Authored: Fri Aug 28 16:01:10 2015 +0200 Committer: blerer Committed: Fri Aug 28 16:01:10 2015 +0200 -- src/java/org/apache/cassandra/tools/NodeTool.java | 11 ++- 1 file changed, 6 insertions(+), 5 deleti

[3/5] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fb4e58b/src/java/org/apache/cassandra/tools/NodeTool.java -- diff --cc src/java/org/apache/cassandra/tools/NodeTool.java index 10c0915,8e88f45..3cb51e2 --- a/src/java/org/apach

[2/8] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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/b4104e1e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4104e1e Diff: http://git-wip-us.apache.org/repos/asf

[8/8] cassandra git commit: Merge branch cassandra-3.0 into trunk

/cassandra/diff/edade5ac Branch: refs/heads/trunk Commit: edade5ac33f29a88fd24df0bd96b3984c302be10 Parents: bf85616 efe9a7d Author: blerer Authored: Fri Aug 28 16:14:54 2015 +0200 Committer: blerer Committed: Fri Aug 28 16:15:00 2015 +0200

[4/8] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fb4e58b/src/java/org/apache/cassandra/tools/nodetool/Status.java -- diff --cc src/java/org/apache/cassandra/tools/nodetool/Status.java index c4b2295,000..99f745d mode 10064

[7/8] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

/cassandra/diff/efe9a7dc Branch: refs/heads/trunk Commit: efe9a7dc4d185a2dfe35b7a77f5bb853e323c52c Parents: b4104e1 5fb4e58 Author: blerer Authored: Fri Aug 28 16:10:09 2015 +0200 Committer: blerer Committed: Fri Aug 28 16:12:32 2015 +0200

[1/8] cassandra git commit: Fixes race during construction of commit log: - Moves thread start outside of constructor for all commit log classes. - Removes all references to CommitLog.instance from co

Repository: cassandra Updated Branches: refs/heads/trunk bf85616f6 -> edade5ac3 Fixes race during construction of commit log: - Moves thread start outside of constructor for all commit log classes. - Removes all references to CommitLog.instance from commitlog package. patch by Branimir Lambov;

[5/8] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fb4e58b/src/java/org/apache/cassandra/tools/NodeTool.java -- diff --cc src/java/org/apache/cassandra/tools/NodeTool.java index 10c0915,8e88f45..3cb51e2 --- a/src/java/org/apach

[3/8] cassandra git commit: consistently sort DCs in nodetool:status

/cassandra/tree/264cf364 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/264cf364 Branch: refs/heads/trunk Commit: 264cf3647b33109e44babc0aa397ee7b492265ed Parents: 7e1ea4c Author: Chris Burroughs Authored: Fri Aug 28 16:01:10 2015 +0200 Committer: blerer Committed: Fri Aug 28 16:01:10

[6/8] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

/cassandra/diff/5fb4e58b Branch: refs/heads/trunk Commit: 5fb4e58bc9d85f8248852982d4ef7a216967ade7 Parents: 01a11fd 264cf36 Author: blerer Authored: Fri Aug 28 16:03:16 2015 +0200 Committer: blerer Committed: Fri Aug 28 16:07:49 2015 +0200

  1   2   3   4   5   6   7   8   9   10   >