Paulo Motta
44d2b80098
ninja: fix thread priorities workaround url on jvm.options
2017-01-06 09:54:37 -02:00
Stefania Alborghetti
4fefdee591
Merge branch 'cassandra-3.11' into cassandra-3.X
2017-01-06 10:05:00 +01:00
Stefania Alborghetti
ad8c23691a
Merge branch 'cassandra-3.0' into cassandra-3.11
2017-01-06 10:04:29 +01:00
Stefania Alborghetti
65bd455235
Replace empty strings with null values if they cannot be converted
...
patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-12794
2017-01-06 10:03:11 +01:00
Robert Stupp
a90b3feba5
Merge branch 'cassandra-3.11' into cassandra-3.X
2017-01-06 09:37:51 +01:00
Robert Stupp
e6ee718c85
Merge branch 'cassandra-3.0' into cassandra-3.11
2017-01-06 09:37:30 +01:00
Robert Stupp
eca51a0348
Merge branch 'cassandra-3.0' into cassandra-3.X
2017-01-05 22:26:48 +01:00
Robert Stupp
6e716c6da4
Merge branch 'cassandra-2.2' into cassandra-3.0
2017-01-05 22:20:31 +01:00
Robert Stupp
6f360b6d23
Remove support for non-JavaScript UDFs
...
patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-12883
2017-01-05 22:19:50 +01:00
Dikang Gu
5f3b35981d
Use new token allocation for non bootstrap case as well.
...
patch by Dikang Gu; reviewed by Branimir Lambov for CASSANSRA-13080
2017-01-05 12:11:14 -08:00
Michael Shuler
aa7882e54f
Merge branch 'cassandra-3.11' into cassandra-3.X
2017-01-04 10:00:27 -06:00
Michael Shuler
26d467e800
Merge branch 'cassandra-3.0' into cassandra-3.11
2017-01-04 10:00:15 -06:00
Michael Shuler
c0765ed820
Merge branch 'cassandra-2.2' into cassandra-3.0
2017-01-04 09:59:55 -06:00
Michael Shuler
0cf0f67dfb
Create PID directory in RPM init for CASSANDRA-13046
2017-01-04 09:56:37 -06:00
Robert Stupp
578e137f0c
Merge branch 'cassandra-3.11' into cassandra-3.X
2017-01-04 13:32:59 +01:00
Robert Stupp
48ca31409d
Merge branch 'cassandra-3.0' into cassandra-3.11
2017-01-04 13:32:53 +01:00
Robert Stupp
5983ce262f
Merge branch 'cassandra-2.2' into cassandra-3.0
2017-01-04 13:32:47 +01:00
Jay Zhuang
8a112ca8ae
AutoSavingCache does not store required keys making RowCacheTests Flaky
...
patch by Jay Zhuang; reviewed by Robert Stupp for CASSANDRA-12453
2017-01-04 13:32:23 +01:00
Stefania Alborghetti
342e28f695
Merge branch 'cassandra-3.11' into cassandra-3.X
2017-01-04 08:08:31 +01:00
Stefania Alborghetti
e043d7d0bf
Merge branch 'cassandra-3.0' into cassandra-3.11
2017-01-04 08:07:52 +01:00
Stefania Alborghetti
d2344683d3
Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348)
...
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-12348
2017-01-04 08:04:52 +01:00
Paulo Motta
04ee4ccb90
Merge branch 'cassandra-3.11' into cassandra-3.X
2017-01-04 00:25:23 -02:00
Paulo Motta
cac7364e77
Merge branch 'cassandra-3.0' into cassandra-3.11
2017-01-04 00:24:08 -02:00
Paulo Motta
37e124e81d
Follow-up CASSANDRA-12905: always return future on Keyspace.applyFuture
...
Before CASSANDRA-12905, applyFuture always returned a future, regardless of whether isDeferrable was set or not.
This behavior should be maintained for applyFuture calls or compatibility method
Keyspace.apply(mutation, writeCommitlog, updateIndexes, isClReplay, isDeferrable, future).
2017-01-04 00:22:48 -02:00
Marcus Olsson
3f1a3b2f60
Avoid creating KeyCacheKey instance when key cache is disabled
...
patch by Marcus Olsson; reviewed by jasobrown for CASSANDRA-13084
2017-01-03 14:02:10 -08:00
T Jake Luciani
917d13f00f
Merge branch 'cassandra-3.11' into cassandra-3.X
2017-01-03 13:04:32 -05:00
T Jake Luciani
68f7ce440e
Merge branch 'cassandra-3.0' into cassandra-3.11
2017-01-03 13:03:49 -05:00
T Jake Luciani
617bd23e8b
Merge branch 'cassandra-2.2' into cassandra-3.0
2017-01-03 12:55:53 -05:00
Joel Knighton
e4f732536a
Don't return early from DynamicEndpointSnitch when null scores are encountered
...
Patch by Joel Knighton; reviewed by tjake for CASSANDRA-13074
2017-01-03 12:50:18 -05:00
Dikang Gu
4aa09eb7a7
More fixes to the TokenAllocation
...
patch by Dikang Gu; reviewed by Branimir Lambov for CASSANSRA-12990
2016-12-27 10:50:52 -08:00
Paulo Motta
39d77f43e3
ninja: fix isDecomissioning check from CASSANDRA-12008
2016-12-23 21:26:52 -02:00
Kurt
cbb9d5d828
Require forceful decommission if number of nodes is less than replication factor
...
patch by Kurt Greaves; Reviewed by Paulo Motta for CASSANDRA-12510
2016-12-23 21:25:59 -02:00
Stefania Alborghetti
cc16ff11ca
Merge branch 'cassandra-3.11' into cassandra-3.X
2016-12-23 09:41:38 +08:00
Stefania Alborghetti
84b1725fb4
Fixed query monitoring for range queries
...
patch by Stefania Alborghetti; reviewed by Alex Petrov for CASSANDRA-13050
2016-12-23 09:39:05 +08:00
Dave Brosius
0d4fdadbfe
Merge branch 'cassandra-3.11' into cassandra-3.X
2016-12-22 20:20:32 -05:00
Dave Brosius
eaced9a541
fix typo: wrong if guard variable
2016-12-22 20:19:53 -05:00
Stefania Alborghetti
f6b4ab4170
Merge branch 'cassandra-3.11' into cassandra-3.X
2016-12-22 11:20:58 +08:00
Stefania Alborghetti
b98767868a
Merge branch 'cassandra-3.0' into cassandra-3.11
2016-12-22 11:20:36 +08:00
Stefania Alborghetti
b0f85b96dc
Merge branch 'cassandra-2.2' into cassandra-3.0
2016-12-22 11:19:32 +08:00
Stefania Alborghetti
f4fd0928e6
cqlsh copy-from: encode column names to avoid primary key parsing errors
...
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-12909
2016-12-22 11:17:39 +08:00
Stefania Alborghetti
a224b2f6e2
Merge branch 'cassandra-3.11' into cassandra-3.X
2016-12-22 10:29:33 +08:00
Stefania Alborghetti
958ba452e7
Merge branch 'cassandra-3.0' into cassandra-3.11
2016-12-22 10:29:15 +08:00
Stefania Alborghetti
11f7ba9481
Merge branch 'cassandra-2.2' into cassandra-3.0
2016-12-22 10:27:23 +08:00
Stefania Alborghetti
6bce8b0270
Merge branch 'cassandra-2.1' into cassandra-2.2
2016-12-22 10:25:27 +08:00
Stefania Alborghetti
bdca25e96e
cqlsh copy-from: sort user type fields in csv
...
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-12959
2016-12-22 10:23:57 +08:00
Paulo Motta
5a8171c0e7
Merge branch 'cassandra-3.11' into cassandra-3.X
2016-12-20 12:16:57 -02:00
Paulo Motta
4ed9df6dfc
Merge branch 'cassandra-3.0' into cassandra-3.11
2016-12-20 12:15:20 -02:00
Paulo Motta
13e939624d
ninja #12905 : reinstate Keyspace.apply(mutation, writeCommitlog, updateIndexes, isClReplay, isDeferrable) for compatibility
2016-12-20 12:13:36 -02:00
Stefania Alborghetti
2df8112d92
Merge branch 'cassandra-3.11' into cassandra-3.X
2016-12-20 10:11:05 +08:00
Stefania Alborghetti
e35f4f9d73
Merge branch 'cassandra-3.0' into cassandra-3.11
2016-12-20 10:10:35 +08:00