Joshua McKenzie
58bee04ccb
Return %ERRORLEVEL% in nodetool.bat
...
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10078
2015-08-14 15:22:50 -04:00
Sylvain Lebresne
3aa7308e8f
Improve assertions around some of the usage of AbstractBounds
...
patch by Sylvain Lebresne and Ariel Weisberg; reviewed by Aleksey
Yeschenko for CASSANDRA-9462
2015-08-14 21:20:17 +03:00
Joshua McKenzie
10be826e7a
ninja remove unnecessary prints from Windows startup scripts
2015-08-14 11:49:32 -04:00
Tyler Hobbs
da3a5a7fa2
Merge branch 'cassandra-2.1' into cassandra-2.2
2015-08-14 10:45:09 -05:00
Paulo Motta
7a6a5097a3
cqlsh: specify encoding w/ command line option
...
Patch by Paulo Motta; reviewed by Tyler Hobbs for CASSANDRA-10004
2015-08-14 10:40:58 -05:00
Peter Palaga
1ba949af40
Unable to start Thrift RPC server in cassandra deployment created using cassandra-all
...
patch by Peter Palaga; reviewed by Robert Stupp for CASSANDRA-10071
2015-08-14 17:23:22 +02:00
T Jake Luciani
23826f7a26
fix histogram overflow exception
...
Patch by tjake; reviewed by carlyeks for CASSANDRA-9973
2015-08-14 10:22:53 -04:00
Sam Tunnicliffe
2d8ccf077e
Ninja fix SelectionColumnMappingTest broken by CASSANDRA-9771
2015-08-14 14:32:27 +01:00
Joshua McKenzie
ab1433600f
Revert "Remove incorrect file separator in CommitLogArchiver on Windows"
...
This reverts commit 5c88651a41 .
Turns out this change is both a) incorrect and b) unnecessary to fix the
snapshot tests.
2015-08-13 10:52:54 -04:00
Jason Brown
9a6ee93f63
Route gossip messages over dedicated socket
...
patch by awiesberg; reviewed by jasobrown for CASSANDRA-9237
2015-08-13 05:38:45 -07:00
Aleksey Yeschenko
85d550f946
Follow-up to CASSANDRA-9265
...
patch by Aleksey Yeschenko
2015-08-13 01:48:07 +03:00
Joshua McKenzie
5c88651a41
Remove incorrect file separator in CommitLogArchiver on Windows
...
Patch by jmckenzie; reviewed by pmotta for CASSANDRA-9897
2015-08-12 12:20:57 -04:00
Jonathan Ellis
972ae14724
Merge branch 'cassandra-2.0' into cassandra-2.1
2015-08-11 16:32:47 -05:00
blambov
50e5802a7d
Stop CommitLogTest hanging
...
patch by branimir; reviewed by aweisberg for CASSANDRA-8992
2015-08-11 16:12:59 -05:00
Robert Stupp
fec40fd43b
Fix CASSANDRA-9771
...
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-10040
2015-08-11 22:24:41 +02:00
Chris Moos
1960e5b367
Remove identity sstable from Lifecycle transaction on cancel
...
Patch by cmoos; reviewed by jmckenzie for CASSANDRA-10008
2015-08-11 15:02:00 -04:00
Paulo Motta
6c723101f7
Add sstablerepairedset.bat
...
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-9982
2015-08-11 12:34:51 -04:00
Marcus Eriksson
5431a88d7b
Merge branch 'cassandra-2.1' into cassandra-2.2
...
Conflicts:
test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
2015-08-11 10:18:03 +02:00
Marcus Eriksson
012b987e26
Merge branch 'cassandra-2.0' into cassandra-2.1
...
Conflicts:
CHANGES.txt
test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
2015-08-11 10:11:15 +02:00
Marcus Eriksson
028e7cb5af
Add tool to find why expired sstables are not getting dropped
...
Patch by marcuse; reviewed by stefania for CASSANDRA-10015
2015-08-11 09:31:30 +02:00
Marcus Eriksson
4f14c85471
Document removal of cold_reads_to_omit (CASSANDRA-9997)
2015-08-10 13:49:05 +02:00
Marcus Eriksson
2dd8101ae0
Merge branch 'cassandra-2.1' into cassandra-2.2
2015-08-10 09:27:22 +02:00
Marcus Eriksson
76e8eb853f
Fixup missed nit from CASSANDRA-9965
2015-08-10 09:25:41 +02:00
Marcus Eriksson
9c3b967e71
Merge branch 'cassandra-2.1' into cassandra-2.2
...
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/config/CFMetaData.java
2015-08-10 09:08:39 +02:00
Marcus Eriksson
5aca7d79aa
Add new JMX methods to change local compaction strategy
...
Patch by marcuse; reviewed by iamaleksey for CASSANDRA-9965
2015-08-10 09:02:47 +02:00
blerer
6d0cf7dbd2
Merge branch 'cassandra-2.1' into cassandra-2.2
2015-08-09 22:12:16 +02:00
blerer
c8d163f73c
Allows single-column slice restrictions to be merged with multi-columns slice restrictions
...
patch by Benjamin Lerer; reviewed by Sam Tunnicliffe for CASSANDRA-9606
2015-08-09 22:09:48 +02:00
blerer
1ae58ef3ac
Merge branch 'cassandra-2.0' into cassandra-2.1
2015-08-09 22:04:56 +02:00
Aleksey Yeschenko
0b99d33eec
Merge branch 'cassandra-2.1' into cassandra-2.2
2015-08-09 23:01:06 +03:00
sankalp kohli
07a7e80c32
Write hints for paxos commits
...
patch by Sankalp Kohli and Aleksey Yeschenko for CASSANDRA-7342
2015-08-09 22:52:03 +03:00
blerer
de84a5c770
Allows single-column slice restrictions to be merged with multi-columns slice restrictions
...
patch by Benjamin Lerer; reviewed by Sam Tunnicliffe for CASSANDRA-9606
2015-08-09 21:48:04 +02:00
blerer
a5297f16ee
Makes AggregationTest.testAggregateWithWriteTimeOrTTL more robust
...
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko for CASSANDRA-9891
2015-08-09 21:12:11 +02:00
Benedict Elliott Smith
0871533945
Merge branch 'cassandra-2.1' into cassandra-2.2
...
Conflicts:
src/java/org/apache/cassandra/service/CassandraDaemon.java
test/unit/org/apache/cassandra/db/CommitLogTest.java
2015-08-09 09:40:09 +02:00
Paulo Motta
3b7934f1aa
Ensure commit log stop policy is enforced at startup
...
patch by paulo; reviewed by benedict for CASSANDRA-8515
2015-08-09 09:34:05 +02:00
Benedict Elliott Smith
6fd41ab158
Merge branch 'cassandra-2.1' into cassandra-2.2
...
Conflicts:
src/java/org/apache/cassandra/db/commitlog/BatchCommitLogService.java
2015-08-08 12:36:21 +02:00
Benedict Elliott Smith
98a08ebcf1
Make batch commit log mode easier to tune
...
This patch effectively ignores the batch commit log
mode sync interval option, and performs a sync as soon
as work becomes available, causing a natural grouping
of writes and minimal latency.
patch by benedict; reviewed by ariel for CASSANDRA-9533
2015-08-08 12:33:22 +02:00
Tyler Hobbs
67903d7789
Merge branch 'cassandra-2.1' into cassandra-2.2
...
Conflicts:
CHANGES.txt
2015-08-07 15:52:47 -05:00
Tyler Hobbs
1e3f03e5b7
Add CHANGES.txt entry for CASSANDRA-10000
2015-08-07 15:52:04 -05:00
Tyler Hobbs
ce7159e102
Merge branch 'cassandra-2.1' into cassandra-2.2
...
Conflicts:
NEWS.txt
pylib/cqlshlib/formatting.py
2015-08-07 15:49:42 -05:00
Paulo Motta
1ecc9cd61e
cqlsh: Fix timestamps before 1970 on Windows
...
This also has the side effect of displaying timestamps in the UTC
timezone instead of the local timezone.
Patch by Paulo Motta; reviewed by Tyler Hobbs for CASSANDRA-10000
2015-08-07 15:45:16 -05:00
Tyler Hobbs
8ffeebff63
Merge branch 'cassandra-2.1' into cassandra-2.2
...
Conflicts:
CHANGES.txt
bin/cqlsh
2015-08-07 15:34:16 -05:00
David Kua
34193ee766
cqlsh: Avoid overwriting config with old config
...
Patch by David Kua; reviewed by Tyler Hobbs for CASSANDRA-9777
2015-08-07 15:30:59 -05:00
Tyler Hobbs
5b68b2dddf
Merge branch 'cassandra-2.1' into cassandra-2.2
2015-08-07 11:44:54 -05:00
Tyler Hobbs
4d1b8b4186
Return dropped messages log to INFO level
...
CASSANDRA-9793 accidentally changed the logging level to ERROR
2015-08-07 11:43:51 -05:00
Sam Tunnicliffe
39c78692be
Merge branch 'cassandra-2.1' into cassandra-2.2
2015-08-07 15:43:12 +01:00
Sam Tunnicliffe
e8f2cb50f7
Merge branch 'cassandra-2.0' into cassandra-2.1
2015-08-07 15:41:37 +01:00
Sam Tunnicliffe
c9587cd2bd
Separate pool for hint delivery tasks in HintedHandoffManager
2015-08-07 15:36:40 +01:00
Marcus Eriksson
bf08e663b7
Merge branch 'cassandra-2.1' into cassandra-2.2
...
Conflicts:
CHANGES.txt
2015-08-07 08:21:47 +02:00
Marcus Eriksson
e9b975c279
Release the self ref when opening snapshot sstable readers
...
Patch by marcuse; reviewed by benedict for CASSANDRA-9998
2015-08-07 08:20:06 +02:00
Yuki Morishita
ed4fad19ec
Fix NPE when internode compression is off
...
patch by yukim; reviewed by Jeremiah Jordan; follow up for CASSANDRA-9884
2015-08-06 22:04:54 -05:00