Tyler Hobbs
8de24ca68a
Merge branch 'cassandra-3.0' into cassandra-3.11
2016-11-29 15:34:26 -06:00
Tyler Hobbs
d70b336de3
Merge branch 'cassandra-2.2' into cassandra-3.0
2016-11-29 15:30:35 -06:00
Adam Holmberg
d38bf9faa4
Fix cqlsh DESC TYPES errors
...
Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-12914
2016-11-29 15:30:09 -06:00
Stefan Podkowinski
c4cb915eaf
Replace keystore for utests with non export restricted cipher keys
...
patch by Stefan Podkowinski; reviewed by Jason Brown for CASSANDRA-12945
2016-11-29 11:06:08 -08:00
Chris Lohfink
f87d074cd2
Remove timing window in test case
...
patch by Chris Lohfink; reviewed by Stefan Podkowinski for CASSANDRA-12875
2016-11-29 11:05:25 -08:00
Sam Tunnicliffe
d5dbd0c756
Merge branch 'cassandra-3.0' into cassandra-3.11
2016-11-29 17:07:10 +00:00
Sam Tunnicliffe
0cbcd1301f
Fix CHANGES.txt
2016-11-29 16:59:55 +00:00
Sam Tunnicliffe
820e7a8d81
LocalToken ensures object buffer is on heap
...
Patch by Sam Tunnicliffe; reviewed by Alex Petrov for CASSANDRA-12651
2016-11-29 16:56:37 +00:00
Yuki Morishita
2b65b0d8bf
Merge branch 'cassandra-3.0' into cassandra-3.11
2016-11-28 16:20:59 -06:00
Yuki Morishita
7dd609c8f0
Merge branch 'cassandra-2.2' into cassandra-3.0
2016-11-28 16:09:25 -06:00
Yuki Morishita
4fff69fcbe
Fix leak on skipped SSTables in sstableupgrade
...
patch by yukim; reviewed by Paulo Motta for CASSANDRA-12899
2016-11-28 16:08:42 -06:00
Dave Brosius
9e2fe3d0ba
fix SyncRequest.equals wrt ranges
2016-11-24 00:06:27 -05:00
Stefania Alborghetti
12c63cf4a4
Fix inconsistencies in cassandra-stress load balancing policy
...
patch by Stefania Alborghetti; reviewed by Jake Luciani for CASSANDRA-12919
2016-11-24 08:56:04 +08:00
Dave Brosius
595f1da9ef
fix SyncRequest.equals wrt ranges
2016-11-23 18:37:56 -05:00
Per Otterstrom
801c1a5942
Fixing double division and rounding.
...
Patch by Per Otterstrom; reviewed by dbrosius for CASSANDRA-11752
2016-11-23 18:25:08 -05:00
Sam Tunnicliffe
9cc0c80de2
Fix validation of non-frozen UDT cells
...
Patch by Sergey Dobrodey; reviewed by Sam Tunnicliffe and Tyler Hobbs
for CASSANDRA-12916
2016-11-22 16:58:02 +00:00
Jason Brown
075539a5b0
Merge branch 'cassandra-3.0' into cassandra-3.X
2016-11-21 06:47:17 -08:00
Jason Brown
3fd4c68803
AnticompactionRequestSerializer serializedSize is incorrect
...
patch by jasobrown; reviewed by pcmanus for CASSANDRA-12934
2016-11-21 06:37:56 -08:00
Aleksey Yeschenko
96d67b109a
Merge branch 'cassandra-3.0' into cassandra-3.X
2016-11-18 17:38:31 +00:00
Aleksey Yeschenko
59b40b3173
Merge branch 'cassandra-2.2' into cassandra-3.0
2016-11-18 17:30:46 +00:00
Stefan Podkowinski
9cd7d540de
Avoid blocking gossip during pending range calculation
...
patch by Stefan Podkowinski; reviewed by Joel Knighton for CASSANDRA-12281
2016-11-18 17:29:14 +00:00
Branimir Lambov
f33cd55a5b
Merge branch 'cassandra-3.0' into cassandra-3.X
2016-11-18 12:44:09 +02:00
Branimir Lambov
eb41380cc2
Merge branch 'cassandra-2.2' into cassandra-3.0
2016-11-18 12:36:26 +02:00
Joel Knighton
7d2fdfeb41
Rework tombstone purgeability checks to not use sentinel timestamp to indicate unconditional purgeability
...
patch by Joel Knighton; reviewed by Branimir Lambov for CASSANDRA-12792
2016-11-18 12:25:29 +02:00
Pavel Yaskevich
490c1c27c9
Revert "Add row offset support to SASI"
...
This reverts commit 7d857b46fb .
2016-11-17 15:20:04 -08:00
Yuki Morishita
a1eef56cc0
Merge branch 'cassandra-3.0' into cassandra-3.X
2016-11-16 17:24:29 -06:00
Yuki Morishita
14f36fce33
Merge branch 'cassandra-2.2' into cassandra-3.0
2016-11-16 15:24:34 -06:00
Paulo Motta
84b9e72788
Fail repair if participant dies during sync or anticompaction
...
Patch by Paulo Motta; Reviewed by Yuki Morishita for CASSANDRA-12901
This reverts the behavior of repair relying exclusively on TCP keep-alive to
detect node failures during sync introduced by CASSANDRA-3569.
2016-11-16 15:20:46 -06:00
Michael Shuler
0cb3128f6f
Merge branch 'cassandra-3.0' into cassandra-3.X
2016-11-16 14:32:04 -06:00
Michael Shuler
ac279e2f71
Increment version to 3.0.11 and fix a CHANGES entry
2016-11-16 14:31:31 -06:00
Paulo Motta
78de13bcc7
Avoid shutting down socket input/output on StreamSession since this is not supported on SSL
...
Patch by Paulo Motta; Reviewed by Sam Tunnicliffe for CASSANDRA-12903
2016-11-15 10:50:08 +00:00
Dikang Gu
4fd05e5b5c
Add the range limit for the split ratio in PartitionerTestCase.
...
Patch by Dikang Gu; Reviewed by Branimir Lambov for CASSANDRA-12858
2016-11-14 13:04:05 -08:00
Sam Tunnicliffe
2f3e07a0ad
Merge branch 'cassandra-3.0' into cassandra-3.X
2016-11-14 12:49:04 +00:00
Eduard Tudenhoefner
d5326866d3
Use correct system_auth table names in cassandra.yaml
...
Patch by Eduard Tudenhoefner; reviewed by Sam Tunnicliffe for
CASSANDRA-12911
2016-11-14 12:48:06 +00:00
Sylvain Lebresne
5e9d9ebb0f
example/triggers build fail.
...
patch by Sylvain Lebresne; reviewed by Alex Petrov for CASSANDRA-12861
2016-11-14 10:13:06 +01:00
Eduard Tudenhoefner
578815541a
Move cqlsh syntax rules into separate module and allow easier customization
...
patch by Eduard Tudenhoefner; reviewed by Stefania Alborghetti for CASSANDRA-12897
2016-11-14 14:24:08 +08:00
Robert Stupp
c31463a4cf
Merge branch 'cassandra-3.0' into cassandra-3.X
2016-11-13 12:56:22 +01:00
Robert Stupp
8f15eb1b71
Prevent reloading of logback.xml from UDF sandbox
...
patch by Robert Stupp; reviewed by Carl Yeksigian for CASSANDRA-12535
2016-11-13 12:39:02 +01:00
T Jake Luciani
9259a2a568
Merge branch 'cassandra-3.0' into cassandra-3.X
2016-11-11 14:26:35 -05:00
T Jake Luciani
d6a3ef4863
Add issue to changelog
2016-11-11 14:26:07 -05:00
T Jake Luciani
a394ba0538
Merge branch 'cassandra-3.0' into cassandra-3.X
2016-11-11 14:14:40 -05:00
T Jake Luciani
9ce74db48b
Disallow offheap_buffers memtable allocation
...
Patch by tjake; reviewed by Michael Shuler for CASSANDRA-11039
2016-11-11 14:13:48 -05:00
Sam Tunnicliffe
a26d25f78a
Merge branch 'cassandra-3.0' into cassandra-3.X
2016-11-11 17:41:13 +00:00
Sam Tunnicliffe
304c47f154
Merge branch 'cassandra-2.2' into cassandra-3.0
2016-11-11 16:14:56 +00:00
Sam Tunnicliffe
ebf3507405
Ninja: add missing assignment in CassandraRoleManager
2016-11-11 16:12:35 +00:00
Sam Tunnicliffe
e3f37c4435
Merge branch 'cassandra-3.0' into cassandra-3.X
2016-11-11 11:32:14 +00:00
Sam Tunnicliffe
d81a49076b
Merge branch 'cassandra-2.2' into cassandra-3.0
2016-11-11 11:28:33 +00:00
Alex Petrov
5e4198ffda
Prepare legacy auth statements if tables initialised after node startup (follow-up)
...
Patch by Alex Petrov; reviewed by Sam Tunnicliffe for CASSANDRA-12813
2016-11-11 11:21:39 +00:00
Stefania Alborghetti
574ca2e2dd
Merge branch 'cassandra-3.0' into cassandra-3.X
2016-11-11 11:01:41 +08:00
Stefania Alborghetti
14b52bca30
Merge branch 'cassandra-2.2' into cassandra-3.0
2016-11-11 11:00:13 +08:00