natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,119 Commits 17 Branches 338 Tags 650 MiB
Commit Graph

1005 Commits

Author SHA1 Message Date
Robert Stupp 4e47bfb3a1 Add support for server side DESCRIBE statements 
patch by Robert Stupp; reviewed by Dinesh Joshi and Benjamin Lerer for CASSANDRA-14825
 2020-06-29 18:01:02 +02:00
Dinesh A. Joshi ffa05ef240 Fix CQLSH UTF-8 encoding issue for Python 2/3 compatibility 
This fix also addresses test failures due to cqlsh return code behavior change

Patch by Dinesh Joshi; Reviewed by Jordan West and Mick Semb Wever for CASSANDRA-15739
 2020-04-22 12:44:47 -07:00
Dinesh A. Joshi 6ee67a64ea Merge branch 'cassandra-3.11' into trunk 2020-04-17 22:26:24 -07:00
Dinesh A. Joshi 9b940a511c Merge branch 'cassandra-3.0' into cassandra-3.11 2020-04-17 22:14:18 -07:00
Jacob Becker a738c58022 cqlsh return non-zero status when STDIN CQL fails 
Patch By Jacob Becker a.k.a. plastikat; reviewed by Jordan West and Dinesh Joshi for CASSANDRA-15623
 2020-04-17 21:47:40 -07:00
Zhao Yang 781e4862fa Fix CQLSH to avoid arguments being evaluated 
Patch By Zhao Yang; reviewed by Dinesh Joshi and Brandon Williams for CASSANDRA-15660
 2020-04-16 09:51:48 -07:00
Eduard Tudenhoefner c05443c098
Allow cqlsh to run with Python 2.7/Python 3.6+ 
* Adds a minimal manual test that starts cqlsh with python3.7 & 3.8 in a Docker container. It also fixes a minor issue when starting up cqlsh with python3.7+, where `webbrowser._tryorder` is `None` as can be seen in https://github.com/python/cpython/blob/3.7/Lib/webbrowser.py#L1. Note that we're checking `webbrowser._tryorder` for `None` instead of doing `webbrowser.get()` because it's likely that there's no default browser installed in a Dockerized environment and so things would fail with `could not locate runnable browser` (https://github.com/python/cpython/blob/3.7/Lib/webbrowser.py#L65)
 * Adds python3.8 testing to CircleCI
 * Fixes some Python warnings that occur with newer versions

 patch by Eduard Tudenhöfner, reviewed by Mick Semb Wever for CASSANDRA-15659
 2020-04-14 20:58:40 +02:00
Yuki Morishita d069fd235f Fix cqlsh erroring out on Python 3.7 due to webbrowser module being absent 
Patch by Yuki Morishita; Reviewed by Dinesh Joshi for CASSANDRA-15572
 2020-04-07 16:24:22 -07:00
Brandon Williams 324267b3c0 Merge branch 'cassandra-3.11' into trunk 2020-02-26 11:51:01 -06:00
Brandon Williams 1b29401e2a Merge branch 'cassandra-3.0' into cassandra-3.11 2020-02-26 11:48:10 -06:00
Brandon Williams 461ae2b2ca Merge branch 'cassandra-2.2' into cassandra-3.0 2020-02-26 11:47:26 -06:00
Brandon Williams b2b1b46486 Allow EXTRA_CLASSPATH to work on tar/source installations 
Patch by brandonwillams, reviewed by David Capwell for CASSANDRA-15567
 2020-02-26 11:46:32 -06:00
Joaquin Casares d629a58045 Unset GREP_OPTIONS 
Patch by Joaquin Casares; Reviewed by Jon Haddad for CASSANDRA-14487
 2020-02-20 17:14:34 -08:00
Dinesh A. Joshi f7b3317379 Update to Python driver 3.21 for cqlsh 
Patch by Dinesh Joshi; reviewed by Jon Haddad, Andy Tolbert and David Capwell for CASSANDRA-14872
 2020-02-20 15:38:44 -08:00
Dinesh A. Joshi 4e0fccc3ed Fix missing Keyspaces in cqlsh describe output 
Patch by Dinesh Joshi; reviewed by Jon Haddad and David Capwell for CASSANDRA-15576
 2020-02-18 11:26:29 -08:00
Michael Shuler 39d170ccd1 Merge branch 'cassandra-3.11' into trunk 2020-02-17 14:09:41 -06:00
Michael Shuler c93c2983cd Switch from www.apache.org/dist to downloads.apache.org 2020-02-17 14:09:01 -06:00
Patrick Bannister bf9a1d487b Make cqlsh and cqlshlib Python 2 & 3 compatible 
Patch by Patrick Bannister; reviewed by Dinesh Joshi, Andy Tolbert and David Capwell for CASSANDRA-10190
 2020-02-14 10:33:57 -08:00
Sam Tunnicliffe 164c8f6def Merge branch 'cassandra-3.11' into trunk 2019-10-08 18:46:33 +01:00
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 18bcda2d4c
Merge branch 'cassandra-3.11' into trunk 2019-05-27 10:45:35 +10: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
Jason Brown f54ac59ac7 Merge branch 'cassandra-3.11' into trunk 2018-12-03 05:15:18 -08: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
pksivar 6e00ab956e Allow using custom script for chronicle queue BinLog archival 
Patch by Pramod K Sivaraju and marcuse; reviewed by Ariel Weisberg
and Sam Tunnicliffe for CASSANDRA-14373
 2018-10-11 13:06:34 +02: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
Sam Tunnicliffe 65fb17a88b Add checksumming to the native protocol 
Patch my Michael Kjellman and Sam Tunnicliffe; reviewed by Dinesh Joshi
and Jordan West for CASSANDRA-13304
 2018-09-01 22:41:37 +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
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 c5285d21c1 Merge branch 'cassandra-3.11' into trunk 2018-05-29 05:21:36 -07: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
Chris Lohfink 0d464cd25f Implement virtual keyspace interface 
patch by Benjamin Lehrer, Chris Lohfink, and Aleksey Yeschenko for
CASSANDRA-7622
 2018-05-18 16:45:45 +01: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 1188fcb082 Merge branch 'cassandra-3.11' into trunk 2018-02-12 05:16:46 -08: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
Ariel Weisberg 59b5b6bef0 Allow storage port to be configurable per node 
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-7544
 2018-01-25 14:32:24 -05:00
Jason Brown 1cb91eaaaa Merge branch 'cassandra-3.11' into trunk 2018-01-19 05:15:28 -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 6d324f9d76 Merge branch 'cassandra-3.11' into trunk 2018-01-15 06:06:51 -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 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
Ariel Weisberg ae837806bd Support a means of logging all queries as they were invoked. 
Patch by Ariel Weisberg; Reviewed by Blake Eggleston
 2017-12-04 18:06:30 -05: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 4b777d6271 Merge branch 'cassandra-3.11' into trunk 2017-08-24 17:03:41 +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
Corentin Chary ed0243954f cqlsh: don't pause when capturing data 
Patch by Corentin Chary; Reviewed by Chris Lohfink for CASSANDRA-13473
 2017-08-10 18:02:31 -07:00
Ariel Weisberg fe3cfe3d7d Merge branch 'cassandra-3.11' into trunk 2017-06-29 16:12:35 -04: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
Murukesh Mohanan aaf2011287 Fix incorrect cqlsh results when selecting same columns multiple times 2017-05-04 19:56:03 +02: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
Matt Byrd 8f5f54fb1c Fix cqlsh automatic protocol downgrade regression 
Patch by Matt Byrd; reviewed by Mick Semb Wever for CASSANDRA-13307
 2017-04-18 17:12:50 +10:00
Michael Shuler ad316820be Merge branch 'cassandra-3.11' into trunk 2017-02-15 18:00:24 -06: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
Sylvain Lebresne 4881d9c308 Thrift removal 
patch by Sylvain Lebresne; reviewed by Aleksey Yeschenko for CASSANDRA-11115
 2016-12-13 10:27:12 +01: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
Stefania Alborghetti 7ca3e28cd5 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-25 08:45:04 +08:00
Stefania Alborghetti c3bf2f47b9 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-25 08:41:55 +08:00
Stefania Alborghetti 3a7cfbd19b Merge branch 'cassandra-2.1' into cassandra-2.2 2016-07-25 08:40:35 +08:00
Yusuke Takata 74647a8cc5 cqlsh does not automatically downgrade CQL version 
patch by Yusuke Takata and Stefania Alborghetti;
reviewed by Stefania Alborghetti and Tyler Hobbs for CASSANDRA-12150
 2016-07-13 10:00:21 +08:00
Tyler Hobbs c7ad00e3ea Remove pre-startup check for open JMX port 
Patch by Tyler Hobbs; reviewed by Sam Tunnicliffe for CASSANDRA-12074
 2016-06-28 11:16:28 -05:00
Robert Stupp bf3255fc93 Ninja fix broken commit from CASSANDRA-8142 2016-06-23 07:34:25 +02:00
Stefania Alborghetti 01847ac510 Merge branch 'cassandra-3.0' into cassandra-3.7 2016-06-01 15:33:45 +02:00
Stefania Alborghetti f99f8a8c82 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-06-01 15:32:48 +02:00
Stefania Alborghetti 43e9d2936e Merge branch 'cassandra-2.1' into cassandra-2.2 2016-06-01 15:30:57 +02:00
Stefania Alborghetti 4008e9bd3f cqlsh: apply current keyspace to source command 
patch by Stefania Alborghetti; reviewed by Robert Stupp for CASSANDRA-11152
 2016-06-01 15:25:40 +02:00
Tyler Hobbs 22e0a1daa6 Merge branch 'cassandra-3.0' into cassandra-3.7 
Conflicts:
	CHANGES.txt
 2016-05-27 15:48:22 -05:00
Zhongxiang Zheng 7a7704e5fd cqlsh: Suppress stacktraces for Read/WriteFailures 
Patch by Zhongxiang Zheng; reviewed by Tyler Hobbs for CASSANDRA-11032
 2016-05-27 15:47:36 -05:00
Tyler Hobbs 58d3b9a904 Merge branch 'cassandra-3.0' into cassandra-3.7 2016-05-05 11:36:29 -05:00
Tyler Hobbs d689da3677 Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2016-05-05 11:34:56 -05:00
Tyler Hobbs 5de9de1f58 cqlsh: Handle non-ascii chars in error messages 
Patch by Tyler Hobbs; reviewed by Paulo Motta for CASSANDRA-11626
 2016-05-05 11:33:35 -05:00
Yuki Morishita 73ad99d9df Merge branch 'cassandra-3.0' into trunk 2016-04-25 20:08:51 -05:00
Yuki Morishita 251449ffad Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-25 20:08:24 -05:00
Yuki Morishita 1d7c0bc210 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-25 20:05:06 -05:00
Wei Deng c43cf8d79b Change order of directory searching for cassandra.in.sh 
patch by Wei Deng; reviewed by yukim for CASSANDRA-11628
 2016-04-25 20:03:27 -05:00
Tyler Hobbs 677230df69 Support for non-frozen UDTS 
Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-7423
 2016-04-08 15:26:12 -05:00
Sylvain Lebresne 66fb8f51ed Change cql version in cqlsh 2016-04-08 15:25:50 +02:00
Tyler Hobbs 3efcdc5f45 Merge branch 'cassandra-3.5' into trunk 2016-04-01 12:36:42 -05:00
Tyler Hobbs 496418ce07 Merge branch 'cassandra-3.0' into cassandra-3.5 
Conflicts:
	CHANGES.txt
	pylib/cqlshlib/copyutil.py
 2016-04-01 12:32:01 -05:00
Stefania Alborghetti 98086b65d0 cqlsh: Improve backoff policy for COPY FROM 
Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for
CASSANDRA-11320
 2016-04-01 12:29:01 -05:00
Yuki Morishita 5e722ee0a0 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-03-22 16:09:06 -05:00
Yuki Morishita b6d0a752e4 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-03-22 16:04:58 -05:00
Jeremiah D Jordan 42644c3240 Backport CASSANDRA-10679 
patch by yukim; reviewed by Jeremiah Jordan for CASSANDRA-9598
 2016-03-22 15:56:06 -05:00
Stefania Alborghetti 1ad9d55675 COPY TO should have higher double precision 
patch by Stefania; reviewed by slebresne for CASSANDRA-11255
 2016-03-18 10:56:49 +01:00
Yuki Morishita 0ac03a20c0 Merge branch 'cassandra-3.5' into trunk 2016-03-11 16:47:49 -06:00
Yuki Morishita de44900a3e Merge branch 'cassandra-3.0' into cassandra-3.5 2016-03-11 16:30:21 -06:00
Yuki Morishita 854a243af9 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-03-11 16:27:42 -06:00
Yuki Morishita 971d649543 (cqlsh) Fix error when result is 0 rows with EXPAND ON 
patch by yukim; reviewed by thobbs for CASSANDRA-11092
 2016-03-11 16:20:33 -06:00
Stefania Alborghetti 1de4a983b2 (cqlsh) interpret CQL type for formatting blobs 
patch by Stefania Alborghetti; reviewed by Adam Holmberg for CASSANDRA-11274
 2016-03-11 00:41:14 +00:00
Yuki Morishita 32b5f8fe49 Merge branch 'cassandra-3.5' into trunk 2016-03-09 11:43:44 -06:00
Yuki Morishita d2333a9256 Merge branch 'cassandra-3.0' into cassandra-3.5 2016-03-09 11:43:37 -06:00
Yuki Morishita b808a18064 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-03-09 11:42:58 -06:00
Joel Knighton f79158998b Add missing newline at end of bin/cqlsh 2016-03-09 11:41:38 -06:00
Sylvain Lebresne acde508159 Merge branch 'cassandra-3.5' into trunk 2016-03-08 10:26:08 +01:00
Sylvain Lebresne 6329d54a6c Merge commit '49c616cf0fc9c8d4649e2ec71a07fb9fd7831318' into cassandra-3.5 2016-03-08 10:25:54 +01:00
Sylvain Lebresne 49c616cf0f Merge commit 'b74ffeafd2e08a7669013d6b4ba87980e1ad5379' into cassandra-3.0 2016-03-08 10:24:26 +01:00
Sylvain Lebresne b74ffeafd2 Merge commit 'c3d2f26f46c2d37b6cf918cbb5565fe57a5904cc' into cassandra-2.2 2016-03-08 10:23:08 +01:00
Stefania Alborghetti c3d2f26f46 COPY FROM on large datasets: fix progress report and debug performance 
patch by Stefania Alborghetti; reviewed by Adam Holmberg for CASSANDRA-11053
 2016-03-08 10:19:13 +01:00
Pavel Trukhanov ab793c7f3b (cqlsh) Show static columns in a different color 
patch by Pavel Trukhanov; reviewed by yukim for CASSANDRA-11059
 2016-03-07 16:15:42 -06:00
Stefan Podkowinski 70649a8d65 Add cqlshrc option to always connect using ssl 
patch by Stefan Podkowinski; reviewed by Paulo Motta for CASSANDRA-10458
 2016-02-29 18:21:05 +00:00
Jeremiah D Jordan e856d8f81e Update cqlsh python version checking to find python2.7 
patch by Jeremiah Jordan; reviewed by Stefania Alborghetti for CASSANDRA-11212
 2016-02-24 05:54:20 -08:00
Jason Brown a62397782c Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-24 05:52:53 -08:00
Jeremiah D Jordan 941d13dac8 Update cqlsh python version checking to find python2.7 
patch by Jeremiah Jordan; reviewed by Stefania Alborghetti for CASSANDRA-11212
 2016-02-24 05:51:42 -08:00
Paulo Motta a12188cd4e cqlsh: change default encoding to UTF-8 
patch by Paulo Motta; reviewed by Stefania Alborghetti for CASSANDRA-11124
 2016-02-24 05:46:08 -08:00
Jason Brown d7e0c30186 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-24 05:44:41 -08:00
Paulo Motta 66b0d3f016 cqlsh: change default encoding to UTF-8 
patch by Paulo Motta; reviewed by Stefania Alborghetti for CASSANDRA-11124
 2016-02-24 05:43:00 -08:00
Joshua McKenzie 29066afea3 Merge branch 'cassandra-3.0' into trunk 2016-02-19 14:56:55 -05:00
Adam Holmberg 70c8a53de4 cqlsh: Display milliseconds when datetime overflows 
patch by Adam Holmberg; reviewed by Paulo Motta for CASSANDRA-10625
 2016-02-19 14:55:15 -05:00
Carl Yeksigian aca2a1dcfd Merge branch 'cassandra-3.0' into trunk 2016-02-18 15:55:14 -05:00
Carl Yeksigian 6503335089 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-18 15:50:44 -05:00
Carl Yeksigian 4985fcc86f cqlsh cannot be called through symlink 
patch by Benjamin Zarzycki; reviewed by Carl Yeksigian for CASSANDRA-11037
 2016-02-18 15:48:54 -05:00
Joshua McKenzie 9492efb3c4 Merge branch 'cassandra-3.0' into trunk 2016-02-17 19:24:06 -05:00
Joshua McKenzie 5dbab32042 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-17 19:23:10 -05:00
Stefan Podkowinski 128d144c0d cqlsh: Add local timezone support to cqlsh 
patch by Stefan Podkowinski; reviewed by Paulo Motta for CASSANDRA-10397
 2016-02-17 19:22:17 -05:00
Yuki Morishita 7871c36e36 Merge branch 'cassandra-3.0' into trunk 2016-02-17 10:27:01 -06:00
Yuki Morishita 39e966d852 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-17 10:26:56 -06:00