Commit Graph

22178 Commits

Author SHA1 Message Date
Jason Brown e8b8a90336 Merge branch 'cassandra-3.X' into trunk 2016-12-12 16:46:39 -08:00
Jason Brown 58a29302cf Merge branch 'cassandra-3.11' into cassandra-3.X 2016-12-12 16:45:20 -08:00
Jason Brown 88c59560c9 Merge branch 'cassandra-3.0' into cassandra-3.11 2016-12-12 16:44:36 -08:00
Ariel Weisberg 11601e4f40 fix flakiness in HintsBufferPoolTest
patch by aweisberg; reviewed by jasobrown for CASSANDRA-12894
2016-12-12 16:42:22 -08:00
Robert Stupp 2d21cbda22 Merge branch 'cassandra-3.X' into trunk 2016-12-12 20:39:58 +01:00
Robert Stupp e303863258 Merge branch 'cassandra-3.11' into cassandra-3.X 2016-12-12 20:39:55 +01:00
Robert Stupp 50a9b1abb1 Merge branch cassandra-3.0 into cassandra-3.11 2016-12-12 20:39:41 +01:00
Robert Stupp 7f668c6fe1 Thread local pools never cleaned up
patch by Robert Stupp; reviewed by Jason Brown for CASSANDRA-13033
2016-12-12 20:38:56 +01:00
Jason Brown a92ca61548 Merge branch 'cassandra-3.X' into trunk 2016-12-12 10:42:05 -08:00
Corentin Chary 8d1c33fa92 nodetool stopdaemon errors out
patch by Corentin Chary; reviewed by jasobrown for CASSANDRA-13030
2016-12-12 10:39:54 -08:00
Jason Brown 5364310bf8 Merge branch 'cassandra-3.X' into trunk 2016-12-12 10:31:48 -08:00
Ariel Weisberg 07f990bc2d Log message size in trace message in OutboundTcpConnection
patch by aweisberg; reviewed by jasobrown for CASSANDRA-13028
2016-12-12 10:30:00 -08:00
Jason Brown 9c0fa054a2 Merge branch 'cassandra-3.X' into trunk 2016-12-12 06:24:52 -08:00
Jay Zhuang c0e7110f97 Add timeUnit Days for cassandra-stress
patch by Jay Zhuang; reviewed by jasobrown for CASSANDRA-13029
2016-12-12 06:22:37 -08:00
Benjamin Lerer 31501cc8b1 Merge branch cassandra-3.X into trunk 2016-12-12 14:10:13 +01:00
Alwyn Davis 3b84de4da4 Add mutation size and batch metrics
patch by Alwyn Davis; reviewed by Benjamin Lerer for CASSANDRA-12649
2016-12-12 14:05:39 +01:00
Benjamin Lerer a8acb2a1ba Merge branch cassandra-3.X into trunk 2016-12-12 13:56:07 +01:00
Benjamin Lerer 8883554a1d Merge branch cassandra-3.11 into cassandra-3.X 2016-12-12 13:52:55 +01:00
Benjamin Lerer c80b9fb395 Merge branch cassandra-3.0 into cassandra-3.11 2016-12-12 13:51:25 +01:00
Benjamin Lerer da94781a2c Merge branch cassandra-2.2 into cassandra-3.0 2016-12-12 13:46:24 +01:00
Benjamin Lerer 9a5aef09fe Test bind parameters and unset parameters in InsertUpdateIfConditionTest
patch by Benjamin Lerer; reviewed by Alex Petrov for CASSANDRA-12980
2016-12-12 12:52:18 +01:00
Stefania Alborghetti c09ba58e56 Merge branch 'cassandra-3.X' into trunk 2016-12-12 10:37:03 +08:00
Stefania Alborghetti 84b2e73c65 Merge branch 'cassandra-3.11' into cassandra-3.X 2016-12-12 10:36:22 +08:00
Stefania Alborghetti 4626b4c9b4 Merge branch 'cassandra-3.0' into cassandra-3.11 2016-12-12 10:35:05 +08:00
Stefania Alborghetti 6bd402d12e Set RPC_READY to false when draining or if a node is marked as shutdown
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-12781
2016-12-12 10:29:44 +08:00
Dikang Gu d8049ae105 Merge branch 'cassandra-3.X' into trunk
* cassandra-3.X:
  add method to get size of endpoints to TokenMetadata
2016-12-09 16:19:06 -08:00
Dikang Gu 4901e4b1e9 add method to get size of endpoints to TokenMetadata
Patch by Dikang Gu; reviewed by Jason Brown for CASSANDRA-12999
2016-12-09 16:17:47 -08:00
Paulo Motta 066ba25c53 Merge branch 'cassandra-3.X' into trunk 2016-12-09 16:20:47 -02:00
Paulo Motta 599dbbc9fb Merge branch 'cassandra-3.11' into cassandra-3.X 2016-12-09 16:20:06 -02:00
mmajercik 47d604deb0 Remove outboundBindAny configuration property
Patch by Milan Majercik; Reviewed by Paulo Motta for CASSANDRA-12673
2016-12-09 16:16:17 -02:00
Paulo Motta f176c574c5 Merge branch 'cassandra-3.0' into cassandra-3.11 2016-12-09 16:15:16 -02:00
Robert Stupp 343612ae4b Merge branch 'cassandra-3.X' into trunk 2016-12-09 11:48:13 +01:00
Robert Stupp 9b09347865 Merge branch 'cassandra-3.11' into cassandra-3.X 2016-12-09 11:48:07 +01:00
Robert Stupp e416c82316 Merge branch 'cassandra-3.0' into cassandra-3.11 2016-12-09 11:44:38 +01:00
Alex Petrov 1cbaceaaa6 Make distinction between unset row and non-existing partition for LWTs
Patch by Alex Petrov; reviewed by Sylvain Lebresne for CASSANDRA-12964.
2016-12-09 11:28:26 +01:00
Sylvain Lebresne 1e067746e4 Merge commit '95d0b671d1af154eaf1c1e81992c7f3f51469eee' into cassandra-3.11
* commit '95d0b671d1af154eaf1c1e81992c7f3f51469eee':
  CQL often queries static columns unnecessarily
2016-12-09 11:27:30 +01:00
Paulo Motta 752f5d566a Merge branch 'cassandra-2.2' into cassandra-3.0 2016-12-08 17:24:22 -02:00
mmajercik dd415263cc Do not specify local address on outgoing connection when listen_on_broadcast_address is set
Patch by Milan Majercik; Reviewed by Paulo Motta for CASSANDRA-12673
2016-12-08 16:45:33 -02:00
Robert Stupp 4604947113 Merge branch 'cassandra-3.X' into trunk 2016-12-08 19:43:44 +01:00
Robert Stupp 0f1f5cec19 Merge branch 'cassandra-3.11' into cassandra-3.X 2016-12-08 19:43:34 +01:00
Robert Stupp d19b6d8841 testall failure in org.apache.cassandra.cql3.validation.entities.UFTest.testAllNativeTypes
(fix missing merge in 3.11)

patch by Robert Stupp; reviewed by Alex Petrov for CASSANDRA-12817
2016-12-08 19:42:52 +01:00
Sylvain Lebresne 894b4e20ed Merge branch 'cassandra-3.X' into trunk
* cassandra-3.X:
  Make distinction between unset row and non-existing partition for LWTs
2016-12-08 17:28:10 +01:00
Sylvain Lebresne 26339b3f23 Merge branch 'cassandra-3.0' into cassandra-3.X
* cassandra-3.0:
  Make distinction between unset row and non-existing partition for LWTs
2016-12-08 17:26:48 +01:00
Alex Petrov d9b06e8af4 Make distinction between unset row and non-existing partition for LWTs
Patch by Alex Petrov; reviewed by Sylvain Lebresne for CASSANDRA-12964.
2016-12-08 17:22:06 +01:00
Sylvain Lebresne 717e1320ea Paxos regression from CASSANDRA-12716
patch by Sylvain Lebresne; reviewed by Joel Knighton for CASSANDRA-13012
2016-12-08 09:18:17 +01:00
Aleksey Yeschenko 7a6ad9e657 Merge branch 'cassandra-3.X' into trunk 2016-12-07 20:57:06 +00:00
Aleksey Yeschenko 7eac22dd41 Remove redundant isLive() check on hint write path
patch by Aleksey Yeschenko; reviewed by Jason Brown for CASSANDRA-12998
2016-12-07 20:55:44 +00:00
Aleksey Yeschenko 96ff08c1b2 Merge branch 'cassandra-3.X' into trunk 2016-12-07 15:49:05 +00:00
Corentin Chary 7b1e2ed6e3 Fix primary index calculation for SASI
Patch by Corentin Chary; reviewed by Alex Petrov for CASSANDRA-12910.
2016-12-07 15:48:36 +00:00
Robert Stupp d2a92e4b15 Merge branch 'cassandra-3.X' into trunk 2016-12-07 13:24:08 +01:00