Commit Graph

865 Commits

Author SHA1 Message Date
Sam Tunnicliffe 3040965668 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-10-08 18:44:48 +01:00
Sam Tunnicliffe 0388d89e29 Allow max protocol version to be capped
Patch by Sam Tunnicliffe; reviewed by Alex Petrov and Aleksey
Yeschenko for CASSANDRA-15193
2019-10-08 18:09:52 +01:00
Mick Semb Wever 6e5150697e
Merge branch 'cassandra-3.0' into cassandra-3.11 2019-05-27 10:44:38 +10:00
Mick Semb Wever ac10b81731
Add ability to customize cassandra log directory using $CASSANDRA_LOG_DIR
Patch by Zephyr Guo; Reviewed by Mick Semb Wever for CASSANDRA-15090
2019-05-27 10:19:20 +10:00
Georg Dietrich 85e402a7fd Make stop-server.bat wait for Cassandra to terminate
patch by Georg Dietrich; reviewed by Dinesh Joshi for CASSANDRA-14829
2018-12-03 05:12:49 -08:00
Mick Semb Wever 0aca1b9df8
Merge branch 'cassandra-3.0' into cassandra-3.11 2018-09-05 11:20:12 +10:00
Mick Semb Wever 21ec39a9d6
Merge branch 'cassandra-2.2' into cassandra-3.0 2018-09-05 11:17:49 +10:00
Mick Semb Wever 62e48c5f3f
Fix incorrect cqlsh results when selecting same columns multiple times
Patch by Anthony Grasso; reviewed by Mick Semb Wever for CASSANDRA-13262
2018-09-05 11:13:49 +10:00
Thomas Steinmaurer b8cbdde2b8 Reduce nodetool GC thread count
patch by Thomas Steinmaurer; reviewed by jasobrown for CASSANDRA-14475
2018-05-29 05:19:26 -07:00
Stefan Podkowinski 845243db93 Fix cqlsh.py ssl flag regression
patch by Stefan Podkowinski; reviewed by Jay Zhuang for CASSANDRA-14299
2018-04-17 10:46:57 +02:00
Jason Brown f6ec5c5d18 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-02-12 05:09:58 -08:00
Amichai Rothman 91e83c72de Add MinGW uname check to start scripts
patch by Amichai Rothman; reviewed by jasobrown for CASSANDRA-12940
2018-02-12 05:07:58 -08:00
Jason Brown d0b7566ff8 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-01-19 05:14:45 -08:00
Jason Brown 0d728c1943 ninja-fix a minor documentation oversight in bin/cassandra (CASSANDRA-14175) 2018-01-19 05:12:45 -08:00
Jason Brown 02bbdd6342 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-01-15 06:05:04 -08:00
Jason Brown 685dde10e3 Merge branch 'cassandra-2.2' into cassandra-3.0 2018-01-15 06:03:22 -08:00
Jason Brown 503aec74a5 Merge branch 'cassandra-2.1' into cassandra-2.2 2018-01-15 06:01:14 -08:00
Michael Kjellman f8d73a3acb More PEP8 compliance for cqlsh
patch by Michael Kjellman; reviewed by Jay Zhuang for CASSANDRA-14021
2018-01-15 05:56:44 -08: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
Alex Petrov 6d429cd031 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-11-06 15:52:31 +01:00
Alex Petrov 6c29ee84a2 Allow dropping COMPACT STORAGE flag
Patch by Alex Petrov; reviewed by Sylvain Lebresne for CASSANDRA-10857.
2017-11-06 15:44:51 +01:00
Andrés de la Peña 43e2a10707 Copy session properties on cqlsh.py do_login
patch by Andres de la Peña; reviewed by Zhao Yang for CASSANDRA-13847
2017-09-13 17:58:26 +01:00
Andrés de la Peña 1a2ad2ee04 Copy session properties on cqlsh.py do_login
patch by Andres de la Peña; reviewed by Zhao Yang for CASSANDRA-13640
2017-08-24 16:56:12 +01:00
Andrés de la Peña 000007f67c Merge branch 'cassandra-3.0' into cassandra-3.11 2017-08-24 16:34:03 +01:00
Andrés de la Peña 9497191f5b Copy session properties on cqlsh.py do_login
patch by Andres de la Peña; reviewed by Zhao Yang for CASSANDRA-13640
2017-08-24 16:29:11 +01:00
Ariel Weisberg 7afb97cb66 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-06-29 16:11:31 -04:00
Matt Byrd af20226dca Allow different NUMACTL_ARGS to be passed in
Patch by Matt Byrd; Reviewed by Ariel Weisberg for CASSANDRA-13557
2017-06-29 15:57:09 -04:00
Matt Byrd 9c54d02f73 Fix cqlsh automatic protocol downgrade regression
Patch by Matt Byrd; reviewed by Mick Semb Wever for CASSANDRA-13307
2017-04-19 16:15:37 +10:00
Michael Shuler ad70202783 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-02-15 18:00:06 -06:00
Michael Shuler 7cb2ef0901 Merge branch 'cassandra-2.2' into cassandra-3.0 2017-02-15 17:59:06 -06:00
Michael Shuler 0b9f6de7a8 Merge branch 'cassandra-2.1' into cassandra-2.2 2017-02-15 17:57:03 -06:00
Michael Shuler cb090791c3 Use portable stderr for java error in startup 2017-02-15 17:49:39 -06:00
Jeff Jirsa b63c03bc5d Merge branch 'cassandra-3.0' into cassandra-3.11 2016-12-02 22:34:22 -08:00
Brad Vernon 255505ea79 Saving/restoring MAX_HEAP_SIZE nodetool
Patch by Brad Vernon; Reviewed by Eduard Tudenhoefner for CASSANDRA-12739
2016-12-02 22:32:07 -08:00
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
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
Stefania Alborghetti 13b7362494 Avoid potential AttributeError in cqlsh due to no table metadata
Patch by Stefania Alborghetti; reviewed by Robert Stupp for CASSANDRA-12815
2016-10-25 10:03:21 +08:00
Stefania Alborghetti a0419085d5 cqlsh fails to format collections when using aliases
Patch by Stefania Alborghetti; reviewed by Robert Stupp for CASSANDRA-11534
2016-10-13 09:26:16 +08:00
Stefania Alborghetti 81fd9c6c2b Merge branch 'cassandra-3.0' into trunk 2016-09-22 09:01:52 +08:00
Stefania Alborghetti 47b50b4557 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-09-22 08:58:52 +08:00
Adam Holmberg 50726e7780 Fix authentication problem when invoking clqsh copy from a SOURCE command
Patch by Adam Holmberg; reviewed by Stefania Alborghetti for CASSANDRA-12642
2016-09-22 08:57:47 +08:00
Stefania Alborghetti bdaa53de4e Merge branch 'cassandra-3.9' into trunk 2016-07-29 15:31:21 +08:00
Stefania Alborghetti 8e775eaaf5 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-29 15:30:27 +08:00
Stefania Alborghetti 8868b744ca Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-29 15:29:09 +08:00
Stefania Alborghetti 7bd65a129c Wait for tracing events before returning response and query at same consistency level client side
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11465
2016-07-29 15:28:03 +08:00
Stefania Alborghetti d588af1856 Merge branch 'cassandra-3.9' into trunk 2016-07-25 08:45:56 +08:00