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

936 Commits

Author SHA1 Message Date
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
Yuki Morishita 15b0bd6d03 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-02-17 10:26:48 -06:00
Yuki Morishita 757e314cef Use logback setting for 'cassandra -v' command 
patch by yukim; reviewed by Paulo Motta for CASSANDRA-10767
 2016-02-17 10:26:08 -06:00
Robert Stupp 097ce3873f Merge branch 'cassandra-3.0' into trunk 2016-02-17 13:43:00 +01:00
Robert Stupp fcc40e5886 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-17 13:42:54 +01:00
Robert Stupp 97f3aa681d cqlsh pg-style-strings broken if line ends with ';' 
patch by Robert Stupp; reviewed by Stefania for CASSANDRA-11123
 2016-02-17 13:42:02 +01:00
Aleksey Yeschenko 71ccb16bf9 Merge branch 'cassandra-3.0' into trunk 2016-02-08 12:28:32 +00:00
Aleksey Yeschenko 23f629628e Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-08 12:19:38 +00:00
Paulo Motta d295c7c698 (cqlsh) Support utf-8/cp65001 encoding on Windows 
patch by Paulo Motta; reviewed by Stefania Alborghetti for CASSANDRA-11030
 2016-02-08 12:16:23 +00:00
Stefania Alborghetti 27d88ee335 cqlsh: Include sub-second precision in timestamps by default 
Patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-10428
 2016-02-02 15:04:57 +01:00
Tyler Hobbs 1a31958bfa Merge branch 'cassandra-3.0' into cassandra-3.3 
Conflicts:
	CHANGES.txt
 2016-01-27 14:36:37 -06:00
Eduard Tudenhoefner 414c1c5771 cqlsh: Fix INSERT and UPDATE LWT handling 
Patch by Eduard Tudenhoefner; reviewed by Tyler Hobbs for
CASSANDRA-11003
 2016-01-27 14:35:46 -06:00
Sylvain Lebresne 83ad9ce7d6 Merge branch 'cassandra-3.0' into cassandra-3.3 2016-01-22 16:08:21 +01:00
Sylvain Lebresne bee7917b4d Merge branch 'cassandra-2.2' into cassandra-3.0 2016-01-22 16:03:52 +01:00
Matthieu Nantern 3aaae7aa59 (cqlsh) encode input correctly when saving history 
patch by matthieu.nantern; reviewed by pauloricardomg for CASSANDRA-10948
 2016-01-22 16:03:20 +01:00
Benjamin Lerer cf3dcc2bb2 Merge branch cassandra-3.0 into cassandra-3.3 2016-01-13 14:53:03 +01:00
Benjamin Lerer 95012dab5b Merge branch cassandra-2.2 into cassandra-3.0 2016-01-13 14:49:41 +01:00
Paulo Motta c7f0032912 (cqlsh) Add request timeout option to cqlsh 
patch by Paulo Motta; reviewed by Benjamin Lerer for CASSANDRA-10686
 2016-01-13 14:48:04 +01:00
Paulo Motta c0747d2856 (cqlsh) Add request timeout option to cqlsh 
patch by Paulo Motta; reviewed by Benjamin Lerer for CASSANDRA-10686
 2016-01-13 14:31:28 +01:00
Tyler Hobbs f4ba752b32 Merge branch 'cassandra-3.0' into cassandra-3.3 
Conflicts:
	CHANGES.txt
 2016-01-12 11:53:23 -06:00
Tyler Hobbs 2569fbd142 Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2016-01-12 11:52:24 -06:00
Julien Blondeau de946ae45a cqlsh: Apply --connect-timeout to control conn 
Patch by Julien Blondeau; reviewed by Tyler Hobbs for CASSANDRA-10959
 2016-01-12 11:51:20 -06:00
Stefania Alborghetti 85b8d02aae Match cassandra-loader options in COPY FROM (3.2 version) 
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-9303
 2016-01-06 18:00:46 +01:00
Stefania Alborghetti f288387917 Match cassandra-loader options in COPY FROM (3.0 version) 
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-9303
 2016-01-06 17:58:20 +01:00
Stefania Alborghetti 202cf9b0be Match cassandra-loader options in COPY FROM (2.2 version) 
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-9303
 2016-01-06 17:56:30 +01:00
Stefania Alborghetti 11716547f8 Match cassandra-loader options in COPY FROM 
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-9303
 2016-01-06 17:54:49 +01:00
Robert Stupp 52430b93e5 Merge branch 'cassandra-3.0' into trunk 2015-12-29 15:34:17 +01:00
Robert Stupp 36608cefa3 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-29 15:34:06 +01:00
Bernhard K. Weisshuhn f9ac657456 jemalloc detection fails due to quoting issues in regex 
patch by Bernhard K. Weisshuhn; reviewed by Robert Stupp for CASSANDRA-10946
 2015-12-29 15:31:33 +01:00
Robert Stupp 4d1f8e4045 Merge branch 'cassandra-3.0' into trunk 2015-12-27 17:28:42 +01:00
Robert Stupp 13daf89daf Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-27 17:28:15 +01:00
Robert Stupp af509ec9a1 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-27 17:28:10 +01:00
Yasuharu Goto f1b9e9a65a cqlsh fails to decode utf-8 characters for text typed columns 
patch by Yasuharu Goto; reviewed by Paulo Motta for CASSANDRA-10875
 2015-12-27 17:26:22 +01:00
Sylvain Lebresne 9a27d3fabd Merge branch 'cassandra-3.0' into trunk 2015-12-22 15:12:46 +01:00
Sylvain Lebresne f967257e48 Fix cqlsh after CQL version bump 2015-12-22 15:12:37 +01:00
Aleksey Yeschenko 01b3508e0f Merge branch 'cassandra-3.0' into trunk 2015-12-18 23:30:39 +00:00
Aleksey Yeschenko 2800bf1082 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-18 23:30:16 +00:00
Adam Holmberg bcd68b546b (cqlsh) show correct column names for empty result sets 
patch by Adam Holmberg; reviewed by Ariel Weisberg for CASSANDRA-9813
 2015-12-18 23:26:53 +00:00
Stefania Alborghetti 99880d22de (cqlsh) allow setting TTL with COPY 
patch by Stefania Alborghetti; reviewed by Adam Holmberg for
CASSANDRA-9494
 2015-12-18 23:14:15 +00:00
Aleksey Yeschenko ef37df4e42 Merge branch 'cassandra-3.0' into trunk 2015-12-18 22:48:36 +00:00
Aleksey Yeschenko 2e095833d9 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-18 22:48:12 +00:00
Paulo Motta 9dd2b5ea0f Fix cqlshlib tests on Windows 
patch by Paulo Motta; reviewed by Jim Witschey for CASSANDRA-10541
 2015-12-18 22:46:31 +00:00
Aleksey Yeschenko bab66dd1af Merge branch 'cassandra-3.0' into trunk 2015-12-15 21:40:32 +00:00
Aleksey Yeschenko 1deb044321 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-15 21:39:25 +00:00
Aleksey Yeschenko 57d558fc1e Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-15 21:37:09 +00:00
Stefania Alborghetti 124f1bd261 (cqlsh) further optimise COPY FROM 
patch by Stefania Alborghetti; reviewed by Adam Holmberg for
CASSANDRA-9302
 2015-12-15 21:03:31 +00:00
Sylvain Lebresne 105ccb3d20 Merge branch 'cassandra-3.0' into trunk 2015-12-11 11:51:49 +01:00
Sylvain Lebresne b55523e975 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-11 11:51:24 +01:00
Stefania Alborghetti 7dd6b7de28 Fix 2 cqlshlib tests 
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-10799
 2015-12-11 11:50:17 +01:00
Stefania Alborghetti 95dab2730d Rename copy.py to copyutil.py in cqlshlib 
explanation

patch by Stefania; reviewed by pauloricardomg for CASSANDRA-10799
 2015-12-11 11:48:15 +01:00
Robert Stupp 425dc5f7dc prevent the command "cassandra start" from starting a cluster 
patch by Robert Stupp; reviewed by Michael Shuler for CASSANDRA-8142
 2015-12-05 08:25:27 +01:00
Jeremiah D Jordan b5240204d7 Normalize all scripts 
patch by Jeremiah Jordan; reviewed by yukim for CASSANDRA-10679
 2015-12-02 10:48:27 -06:00
Benjamin Lerer 244ba19988 Merge branch 'cassandra-3.1' into trunk 2015-12-02 11:29:47 +01:00
Adam Holmberg bcdbb0eb94 Normalize cqlsh DESC output 
patch by Adam Holmberg; reviewed by Benjamin Lerer for CASSANDRA-10431
 2015-12-02 11:23:50 +01:00
Stefania 1b81ad19d3 Fix completion problems in cqlsh 
Patch by stefania; reviewed by pmotta for CASSANDRA-10753
 2015-12-01 13:52:09 -05:00
Robert Stupp f55df0b85e Merge branch 'cassandra-3.1' into trunk 2015-12-01 10:41:07 +01:00
Robert Stupp 1cbd82782e Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-01 10:40:07 +01:00
Robert Stupp 8738087edd fix: show CQL help in cqlsh in web browser 
patch by Robert Stupp; reviewed by Paulo Motta for CASSANDRA-7225
 2015-12-01 10:39:05 +01:00
Robert Stupp 9a2fd8ccf3 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-27 15:26:02 +01:00
Robert Stupp 0ee8895b27 Show CQL help in cqlsh in web browser 
patch by Robert Stupp; reviewed by Paulo Motta for CASSANDRA-7225
 2015-11-27 15:24:51 +01:00
Tyler Hobbs 9b3b3ca00f Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2015-11-25 11:57:24 -06:00
Tyler Hobbs a90c3b2b85 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-25 11:56:16 -06:00
Michael Edge 68ea4edb33 cqlsh: print column names before COPY operation 
Patch by Michael Edge; reviewed by Tyler Hobbs for CASSANDRA-8935
 2015-11-25 11:54:11 -06:00
Benjamin Lerer 29b988d8c4 Merge branch cassandra-2.2 into cassandra-3.0 2015-11-24 15:10:17 +01:00
Benjamin Lerer 1142183f56 Merge branch cassandra-2.1 into cassandra-2.2 2015-11-24 15:00:34 +01:00
Michael Edge f319f0a236 Fix inconsistencies within CQLSH help 
patch by Michael Edge; reviewed by Benjamin Lerer for CASSANDRA-10719
 2015-11-24 14:51:35 +01:00
Sylvain Lebresne 84750421a9 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-20 15:12:16 +01:00
Sylvain Lebresne b0fd5178e8 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-20 15:11:51 +01:00
Stefania Alborghetti 05ccdc6411 Improve COPY command to work with Counter columns 
patch by jasonstack; reviewed by Stefania for CASSANDRA-9043
 2015-11-20 15:03:47 +01:00
Robert Stupp 747e5fd4ad Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-19 11:11:24 +01:00