[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

2016-02-03 Thread slebresne 
Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: f1f52e7bb88116e440582090cfce615511716f49
Parents: eef0ddf 35a7194
Author: Sylvain Lebresne 
Authored: Wed Feb 3 12:14:22 2016 +0100
Committer: Sylvain Lebresne 
Committed: Wed Feb 3 12:14:22 2016 +0100

--
 src/java/org/apache/cassandra/db/marshal/DateType.java | 5 +
 src/java/org/apache/cassandra/db/marshal/TimeType.java | 6 --
 2 files changed, 5 insertions(+), 6 deletions(-)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

2016-02-03 Thread slebresne 
Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: 44a5abc35e83370e3d0b4d7cb4301db526981c08
Parents: 00fdaf2 d7bea00
Author: Sylvain Lebresne 
Authored: Wed Feb 3 14:25:25 2016 +0100
Committer: Sylvain Lebresne 
Committed: Wed Feb 3 14:25:25 2016 +0100

--
 src/java/org/apache/cassandra/db/marshal/SimpleDateType.java | 6 --
 1 file changed, 6 deletions(-)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

2016-01-25 Thread marcuse 
Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: 4abd9936342f5faf3e23c3d395e24278a3b3bfbd
Parents: 72790dc f217428
Author: Marcus Eriksson 
Authored: Mon Jan 25 10:09:31 2016 +0100
Committer: Marcus Eriksson 
Committed: Mon Jan 25 10:09:31 2016 +0100

--
 CHANGES.txt |   1 +
 src/java/org/apache/cassandra/db/Memtable.java  |   9 +
 .../db/compaction/CompactionController.java |  19 +-
 .../db/compaction/CompactionControllerTest.java | 195 +++
 4 files changed, 221 insertions(+), 3 deletions(-)
--


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

2016-01-22 Thread slebresne 
Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: 190e14a076a13cbd759aa4e8ec2b0a635e8cc2c1
Parents: f82646e 83ad9ce
Author: Sylvain Lebresne 
Authored: Fri Jan 22 16:08:36 2016 +0100
Committer: Sylvain Lebresne 
Committed: Fri Jan 22 16:08:36 2016 +0100

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


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

2016-01-22 Thread slebresne 
Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: 2f984e330ed6e58582359afa3bb4d5b9cf6e6440
Parents: 190e14a 7074dda
Author: Sylvain Lebresne 
Authored: Fri Jan 22 16:25:15 2016 +0100
Committer: Sylvain Lebresne 
Committed: Fri Jan 22 16:25:15 2016 +0100

--
 CHANGES.txt |  1 +
 .../db/compaction/CompactionManager.java| 25 +---
 .../cassandra/service/StorageService.java   |  1 +
 3 files changed, 19 insertions(+), 8 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f984e33/src/java/org/apache/cassandra/service/StorageService.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

2016-01-22 Thread slebresne 
Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: 5b02fa287b3d662d1fb1190a0c579d66ac6b65e9
Parents: fd74a03 01a10f0
Author: Sylvain Lebresne 
Authored: Fri Jan 22 15:33:16 2016 +0100
Committer: Sylvain Lebresne 
Committed: Fri Jan 22 15:33:16 2016 +0100

--

--

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

2016-01-22 Thread slebresne 
Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: f82646e8164e8aaff78b1c861e75de3630c2a491
Parents: 27f4b41 8ab41c8
Author: Sylvain Lebresne 
Authored: Fri Jan 22 15:51:35 2016 +0100
Committer: Sylvain Lebresne 
Committed: Fri Jan 22 15:51:35 2016 +0100

--
 CHANGES.txt |  2 +
 .../cql3/statements/SelectStatement.java| 22 ++
 .../operations/SelectOrderByTest.java   | 43 
 3 files changed, 60 insertions(+), 7 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f82646e8/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

2016-01-21 Thread marcuse 
Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: 129b68c1c32d0c2d554f48cdd425ca95b5d18856
Parents: 610b134 53339a0
Author: Marcus Eriksson 
Authored: Fri Jan 22 07:30:31 2016 +0100
Committer: Marcus Eriksson 
Committed: Fri Jan 22 07:30:31 2016 +0100

--
 CHANGES.txt |  2 ++
 .../db/compaction/LeveledManifest.java  | 34 ++--
 2 files changed, 26 insertions(+), 10 deletions(-)
--


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

2016-01-20 Thread marcuse 
Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: 5295f763d396fb4ef10ab87ce4fd0797b6e2051d
Parents: 7374e9b d34025a
Author: Marcus Eriksson 
Authored: Wed Jan 20 10:28:45 2016 +0100
Committer: Marcus Eriksson 
Committed: Wed Jan 20 10:28:45 2016 +0100

--

--

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

2016-01-18 Thread slebresne 
Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: ee5aec2d2ed7795d64a052e191af4aec5c807dba
Parents: 22f02fe bf917cb
Author: Sylvain Lebresne 
Authored: Mon Jan 18 15:26:06 2016 +0100
Committer: Sylvain Lebresne 
Committed: Mon Jan 18 15:26:06 2016 +0100

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/service/StartupChecks.java |  2 +-
 src/java/org/apache/cassandra/utils/SigarLibrary.java   |  9 -
 src/java/org/apache/cassandra/utils/UUIDGen.java| 12 
 4 files changed, 22 insertions(+), 2 deletions(-)
--


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

2016-01-18 Thread slebresne 
Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: 22f02fe602361ee93c20d5743c43a53ad65e1d45
Parents: 8f88015 a6170ef
Author: Sylvain Lebresne 
Authored: Mon Jan 18 11:28:05 2016 +0100
Committer: Sylvain Lebresne 
Committed: Mon Jan 18 11:28:05 2016 +0100

--
 doc/cql3/CQL.textile | 2 ++
 1 file changed, 2 insertions(+)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

2016-01-14 Thread yukim 
Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: fc89a379cda4966dd57e3c65ebb5f383cd846925
Parents: ef4d450 628c076
Author: Yuki Morishita 
Authored: Thu Jan 14 09:58:53 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Jan 14 09:58:53 2016 -0600

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java| 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

2016-01-13 Thread yukim 
Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: 8036f04c08385fadc4c527fca5b3478171ae31dc
Parents: 88255d5 a7feb80
Author: Yuki Morishita 
Authored: Wed Jan 13 13:16:32 2016 -0600
Committer: Yuki Morishita 
Committed: Wed Jan 13 13:16:32 2016 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/streaming/ConnectionHandler.java  |  2 +-
 .../cassandra/streaming/StreamReader.java   | 19 ++--
 .../cassandra/streaming/StreamWriter.java   | 10 -
 .../compress/CompressedInputStream.java | 41 ++---
 .../compress/CompressedStreamReader.java| 26 +++
 .../compress/CompressedStreamWriter.java| 15 +++
 .../compression/CompressedInputStreamTest.java  | 46 
 8 files changed, 73 insertions(+), 87 deletions(-)
--


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

2016-01-05 Thread samt 
Merge branch 'cassandra-3.3' into trunk


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

Branch: refs/heads/trunk
Commit: bbaa88d681e31c1890c89a6ac2e0a1a92d09e110
Parents: 9e2c7f0 fd5b1de
Author: Sam Tunnicliffe 
Authored: Tue Jan 5 10:45:59 2016 +
Committer: Sam Tunnicliffe 
Committed: Tue Jan 5 10:45:59 2016 +

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/service/StartupChecks.java | 9 -
 2 files changed, 9 insertions(+), 1 deletion(-)
--