Commit Graph

133 Commits

Author SHA1 Message Date
Mick Semb Wever 8f7f6e903b
Merge branch 'cassandra-3.11' into trunk 2020-01-21 19:12:38 +01:00
Mick Semb Wever 6a8e211fba
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-01-21 19:10:59 +01:00
Mick Semb Wever 14aa561c32
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-01-21 19:08:52 +01:00
Mick Semb Wever d69f7696e4
Create Jenkins pipeline definition, and split out Jenkins test-all builds to individual builds for each of the test targets
patch by Mick Semb Wever; reviewed by David Capwell for CASSANDRA-15496
2020-01-21 18:59:16 +01:00
Mick Semb Wever e80d447bc5
update netbeans project file for latest dependencies 2020-01-01 14:16:08 +01:00
Mick Semb Wever 05d24745b4
update netbeans project file for latest dependencies 2019-11-15 19:01:36 +01:00
Dinesh A. Joshi 5d401f3a39 Merge branch 'cassandra-3.11' into trunk 2019-10-08 14:15:06 -07:00
Dinesh A. Joshi 4675b3fd33 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-10-08 14:10:40 -07:00
Blake Eggleston 587961a19c Merge branch 'cassandra-3.11' into trunk 2019-04-25 10:23:40 -07:00
Blake Eggleston 01d6548e0d Merge branch 'cassandra-3.0' into cassandra-3.11 2019-04-25 10:21:55 -07:00
Blake Eggleston c3ce32e239 Fix assorted gossip races and add related runtime checks
Patch by Blake Eggleston; Reviewed by Ariel Weisberg for CASSANDRA-15059
2019-04-25 10:20:46 -07:00
Mick Semb Wever ed2d32612a
Apache NetBeans "Run", "Debug", "Profile" IDE actions
patch by Mick Semb Wever ; reviewed by Dinesh Joshi for CASSANDRA-15083
2019-04-18 12:07:15 +10:00
Mick Semb Wever 6898953b82
Apache NetBeans project files
patch by Mick Semb Wever ; reviewed by Wade Chandler and Dinesh Joshi for CASSANDRA-15073
2019-04-12 09:33:49 +10:00
Blake Eggleston 9063ceabc9 Fix AbstractBTreePartition locking in java 11
Patch by Blake Eggleston; Reviewed by Benedict Elliot Smith for CASSANDRA-14607
2019-03-25 14:24:16 -07:00
Benedict Elliott Smith 2d05bff0ba Merge branch 'cassandra-3.0' into cassandra-3.11 2019-01-21 17:44:36 +00:00
Benedict Elliott Smith 459945bcf4 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-01-21 17:43:26 +00:00
Joseph Lynch 8ad4a9a522 In JVM dtests need to clean up after instance shutdown
Adds additional cleanup logic to ensure we don't leak classloaders and
their associated objects when running the in JVM dtests.

Patch by Joseph Lynch; reviewed by Alex Petrov for CASSANDRA-14922
2019-01-21 10:13:48 +00:00
Alex Petrov 1d5e0301f3 Introduce in-jvm distributed tests
Patch by Alex Petrov and Benedict Elliott Smith; reviewed by Benedict Elliott Smith and Dinesh Joshi for CASSANDRA-14821.

Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
2019-01-21 10:13:48 +00:00
Joseph Lynch d5005627b0 In JVM dtests need to clean up after instance shutdown
Adds additional cleanup logic to ensure we don't leak classloaders and
their associated objects when running the in JVM dtests.

Patch by Joseph Lynch; reviewed by Alex Petrov for CASSANDRA-14922
2019-01-09 15:00:16 +01:00
Alex Petrov f22fec927d Introduce in-jvm distributed tests
Patch by Alex Petrov and Benedict Elliott Smith; reviewed by Benedict Elliott Smith and Dinesh Joshi for CASSANDRA-14821.

Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
2018-11-16 19:41:58 +01:00
Marcus Eriksson f83bd5ac2b Add fqltool compare
Patch by marcuse; reviewed by Jason Brown and Dinesh Joshi for CASSANDRA-14619
2018-09-01 09:59:21 +02:00
Jordan West d78310d53f Remove hardcoded java11 jvm args in idea workspace files
patch by Jordan West; reviewed by jasobrown for CASSANDRA-14627
2018-08-10 05:40:45 -07:00
Marcus Eriksson 9bc15bacea Default project generation to java8
Patch by marcuse; reviewed by Benedict for CASSANDRA-14613
2018-07-31 15:57:56 +02:00
Robert Stupp 6ba2fb9395 Make C* compile and run on Java 11 and Java 8
patch by Robert Stupp; reviewed by Jason Brown for CASSANDRA-9608
2018-07-26 18:20:00 +02:00
Jay Zhuang 7a424bc2a7 Update Intellij JUnit configuration
And other ninja build fixes.

patch by Jay Zhuang; reviewed by Stefan Podkowinski for CASSANDRA-14169
2018-02-14 16:32:24 +01:00
Sylvain Lebresne 4881d9c308 Thrift removal
patch by Sylvain Lebresne; reviewed by Aleksey Yeschenko for CASSANDRA-11115
2016-12-13 10:27:12 +01:00
Robert Stupp 7eb6b997f2 Ninja, remove gen-thrift-java ant task from IntelliJ launch configs 2016-08-20 21:55:56 +10:00
Robert Stupp 528204267b Ninja, include lib/sigar-bin in java.library.path for IntelliJ launch configs 2016-08-20 21:34:13 +10:00
Christopher Batey b73f581355 Add basic testing support for the Cassandra Stress tool
Patch by Christopher Batey; reviewed by Joel Knighton for CASSANDRA-11638
2016-07-04 14:48:52 +01:00
Robert Stupp 2db8bd560a Ninja-add test/conf to IntelliJ IDE JUnit default config 2016-04-10 18:00:19 +02:00
Robert Stupp 6ac831f327 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-20 17:24:42 +01:00
Robert Stupp 49d9e51555 Reevaluate inspections in generate-idea-files target
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9844
2015-11-20 17:24:03 +01:00
Robert Stupp 2641424247 Add generate-idea-files target to build.xml
Patch by Robert Stupp; Reviewed by T Jake Luciani for CASSANDRA-9123
2015-04-07 18:12:16 +02:00