Commit Graph

187 Commits

Author SHA1 Message Date
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
Mick Semb Wever 4268761695
Merge branch 'cassandra-3.11' into trunk 2018-05-10 12:47:50 +10:00
Mick Semb Wever df9475086d
Detect OpenJDK jvm type and architecture
Patch by Stefan Podkowinski; Reviewed by Mick Semb Wever for CASSANDRA-12793
2018-05-10 12:46:03 +10:00
Benjamin Lerer 17e602b7d2 Merge branch cassandra-3.11 into trunk 2017-12-12 10:52:23 +01:00
Benjamin Lerer a7c45be936 Merge branch cassandra-3.0 into cassandra-3.11 2017-12-12 10:42:50 +01:00
Benjamin Lerer dd187d105b Merge branch cassandra-2.2 into cassandra-3.0 2017-12-12 10:32:36 +01:00
Benjamin Lerer 02aba7343c Rely on the JVM to handle OutOfMemoryErrors
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-13006
2017-12-12 10:21:05 +01:00
Jay Zhuang 41ef972b18 simplify mx4j configuration
patch by Jay Zhuang; reviewed by jasobrown for CASSANDRA-13578
2017-08-24 09:13:56 -07:00
Jason Brown 356dc3c253 switch internode messaging to netty
patch by jasobrown, reviewed by pcmanus for CASSANDRA-8457
2017-08-22 13:54:44 -07:00
Sam Tunnicliffe 9eae8d340c Use custom RMI registry to avoid issues with JMX and SSL
Patch by Sam Tunnicliffe; reviewed by Jake Luciani for CASSANDRA-12109
2016-07-20 13:06:02 +01:00
Stefania Alborghetti 78f077de07 Revert "Update to Netty 4.0.37"
This reverts commit e8d7fe8a28.
2016-07-06 12:58:06 +08:00
Josh McKenzie c86b3e1830 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-06-30 16:33:53 -04:00
Josh McKenzie 6b241097b4 revert CASSANDRA-11949 3.0+ 2016-06-30 16:33:34 -04:00
Josh McKenzie 82cdc8617a Revert "Fix GC logging on first start"
This reverts commit 3a61c10659.
2016-06-30 16:31:43 -04:00
Josh McKenzie 0294fd8911 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-06-28 13:47:49 -04:00
Josh McKenzie 2395f9e467 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-06-28 13:47:24 -04:00
Mahdi Mohammadi 3a61c10659 Fix GC logging on first start
Patch by mmohammadi; reviewed by jmckenzie for CASSANDRA-11949
2016-06-28 13:46:38 -04:00
Robert Stupp e8d7fe8a28 Update to Netty 4.0.37
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-12032
2016-06-21 16:47:37 +02:00
Josh McKenzie 54d7fc4b02 Merge branch 'cassandra-3.0' into cassandra-3.7 2016-05-03 14:06:57 -04:00
Josh McKenzie c7d216e3fe Merge branch 'cassandra-2.2' into cassandra-3.0 2016-05-03 14:06:18 -04:00
Josh McKenzie 8bf453a449 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-05-03 14:05:23 -04:00
Eduard Tudenhoefner 5202147d9f Use -lt comparator for JVM patch version
Patch by etudenhoefner; reviewed by mshuler for CASSANDRA-11661
2016-05-03 14:04:16 -04:00
Sam Tunnicliffe 7b0c7164aa Integrated JMX Authentication and Authorization
Patch by Jan Karlsson and Sam Tunnicliffe; reviewed by Jake Luciani for
CASSANDRA-10091
2016-05-02 11:44:48 +01:00
Aleksey Yeschenko 4254de17f4 Merge branch 'cassandra-3.0' into trunk 2016-04-27 18:26:22 +01:00
Blake Eggleston 7a2be8fa4a Don't require HEAP_NEW_SIZE to be set when using G1
patch by Blake Eggleston; reviewed by Paulo Motta for CASSANDRA-11600
2016-04-27 18:25:04 +01:00
Sylvain Lebresne b78117cf3b Proper handling of IcedTea when finding jvm version in cassandra-env.sh
patch by brandon.williams; reviewed by mshuler for CASSANDRA-8890
2016-03-08 10:30:37 +01:00
Ariel Weisberg 87d80b478b Enable GC logging by default (3.0 version)
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
2016-01-08 10:32:22 +01:00
Sylvain Lebresne f937c8bee8 Revert wrong line removal from bad merge 2016-01-06 14:44:29 +01:00
Ariel Weisberg 3e45fa1ab5 Enable GC logging by default (3.0 version)
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
2016-01-05 18:01:29 +01:00
Ariel Weisberg c04bf2a9bb Enable GC logging by default
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
2016-01-05 17:49:42 +01:00
Paulo Motta 869bdabf42 Move static JVM options to jvm.options file
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10494
2016-01-04 14:17:00 -05:00
Robert Stupp 242b9738f2 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-04 23:29:44 +01:00
Robert Stupp 0ff13d2a68 get JEMAlloc debug output out of nodetool output
patch by Robert Stupp; reviewed by Ariel Weisberg for CASSANDRA-10628
2015-11-04 23:28:57 +01:00
Robert Stupp 4b47d711ec Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-28 20:13:49 +01:00
Robert Stupp 83fcc926eb Update cassandra.yaml comments to reflect memory_allocator deprecation, remove in 3.0
patch by Robert Stupp; reviewed by Jim Witschey for CASSANDRA-10581
2015-10-28 20:12:25 +01:00
Paulo Motta 1415fa512a Revert 7486, make CMS default GC, move gc opts to conf/jvm.options
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10403
2015-10-14 14:36:52 -04:00
Robert Stupp a9db74b30f Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-09 13:14:53 +02:00
Robert Stupp 82dabe0cf5 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-09 13:10:01 +02:00
Thorkild Stray ad93f3b6eb Allow LOCAL_JMX to be easily overridden
patch by Thorkild Stray ; reviewed by Robert Stupp for CASSANDRA-10275
2015-10-09 13:06:33 +02:00
Philip Thompson 0997ad6fff Require java 8u40
Patch by pthompson; reviewed by jmckenzie for CASSANDRA-9416
2015-08-11 10:08:27 -04:00
Jason Brown e7852a3e56 Merge branch 'cassandra-2.2' into trunk 2015-06-25 10:45:43 -07:00
Jason Brown f4449bd455 Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/tools/NodeProbe.java
2015-06-25 10:45:02 -07:00
Jason Brown 628394a6fa Allow JMX over SSL directly from nodetool
patch by Marcus Olsson, reviewed by jasobrown for CASSANDRA-9090
2015-06-25 10:36:42 -07:00
Al Tobey ea36ae9e8a Change default GC to G1
Patch by Al Tobey; reviewed by jmckenzie for CASSANDRA-7486
2015-05-28 13:01:03 -04:00
Aleksey Yeschenko b540c5d208 Fix setting the PerfDisableSharedMem JVM option 2015-05-21 03:37:38 +03:00
Robert Stupp 7b23b95fde Startup slowdown due to preloading jemalloc
Patch by Robert Stupp; Reviewed by Philip Thompson for CASSANDRA-9197
2015-05-12 10:40:10 +02:00
Josh McKenzie bf21df2c3f Merge branch 'cassandra-2.1' into trunk 2015-05-05 13:26:59 -05:00
Benjamin Lerer 233ef3403a (2.1+) Fix remote debugging configuration
Patch by blerer; reviewed by jmckenzie for CASSANDRA-9297
2015-05-05 13:25:40 -05:00
Ariel Weisberg 33f37f86f6 Disable memory mapping of hsperfdata files for JVM statistics
Patch by Ariel Weisberg; reviewed by jmckenzie for CASSANDRA-9242
2015-04-29 14:14:08 -05:00
T Jake Luciani b8717dc201 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	CHANGES.txt
	NEWS.txt
	bin/cassandra.bat
	build.xml
	conf/cassandra-env.sh
	src/java/org/apache/cassandra/service/CassandraDaemon.java
2015-04-01 11:11:53 -04:00