Commit Graph

83 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
Jason Brown 4f1094e668 Merge branch 'cassandra-3.11' into trunk 2018-05-12 05:33:02 -07:00
Jason Brown 443088fd13 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-05-12 05:31:34 -07:00
Shyam Phirke b9b2a4e1a0 Cassandra not starting when using enhanced startup scripts in windows
patch by Shyam Phirke; reviewed by jasobrown CASSANDRA-14418
2018-05-12 05:28:20 -07: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
Benjamin Lerer 05106f0780 Merge branch cassandra-3.X into trunk 2017-01-11 21:31:07 +01:00
Benjamin Lerer 9c2ab25556 Merge branch cassandra-3.0 into cassandra-3.11 2017-01-11 21:28:21 +01:00
Benjamin Lerer 5774d8e235 Removes SetJsr223Env from cassandra-env.ps1 (Follow up CASSANDRA-12883) 2017-01-11 21:23:48 +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
Josh McKenzie d22e3908b6 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-27 12:16:23 -04:00
Paulo Motta d6232e04d7 Add missing options to cassandra-env.ps1
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10939
2016-07-27 12:15:31 -04:00
Paulo Motta 01d5fa8acf Fix Java Version check for versions > 100 on Windows (3.0 patch)
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-12278
2016-07-27 11:41:17 -04:00
Paulo Motta 247a56bca7 Fix Java Version check for versions > 100 on Windows
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-12278
2016-07-27 11:39:28 -04: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 8f5b8db589 Revert "Ninja: suppress printed output on dir creation in Win32 startup"
This reverts commit 3041034fb9.
2016-06-30 16:31:32 -04:00
Josh McKenzie 1d9d56659e Merge branch 'cassandra-3.0' into cassandra-3.9 2016-06-30 13:36:33 -04:00
Josh McKenzie 1991fea8bf Merge branch 'cassandra-2.2' into cassandra-3.0 2016-06-30 13:36:17 -04:00
Josh McKenzie 3041034fb9 Ninja: suppress printed output on dir creation in Win32 startup 2016-06-30 13:35:20 -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
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
Josh McKenzie bd633377a9 Merge branch 'cassandra-3.0' into trunk 2016-04-06 18:57:43 -04:00
Josh McKenzie 04a75a6344 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-06 18:45:09 -04:00
Josh McKenzie 96c53e0a5e Fix launch with whitespace in path on Windows
Patch by jmckenzie; reviewed by pmotta for CASSANDRA-11515
2016-04-06 18:37:08 -04: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
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
Paulo Motta fa909cc420 Fix MAX_HEAP_SIZE check on Windows startup
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10553
2015-10-19 15:12:19 -04: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
Joshua McKenzie e9c0e1787e Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
	CHANGES.txt
2015-09-03 12:42:04 -04:00
Joshua McKenzie e1fc0e0671 Fix failure to start with space in directory name on Windows
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10239
2015-09-03 12:39:43 -04:00
Joshua McKenzie 45eba1adbb Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
	conf/cassandra-env.ps1
2015-09-01 16:29:39 -04:00
Joshua McKenzie 3effec53e3 ninja: remove vestigial log4j from cassandra-env.ps1 2015-09-01 16:29:03 -04:00
Joshua McKenzie a3d9e6c479 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-24 12:44:34 -04:00
Joshua McKenzie 2d477a4cc2 Speed up launch scripts on Windows
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-9615
2015-08-24 12:44:00 -04:00
Joshua McKenzie f50e9321f7 ninja fix typo in cassandra-env.ps1 2015-08-18 13:40:25 -04:00
Joshua McKenzie 1288427669 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-14 11:50:40 -04:00
Joshua McKenzie 10be826e7a ninja remove unnecessary prints from Windows startup scripts 2015-08-14 11:49:32 -04:00