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

225 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Tyler Hobbs 74070ee4ab Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-18 18:31:31 -06:00
Tyler Hobbs d2f243ee5c Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-18 18:25:18 -06:00
Aleksey Yeschenko 39bc5de68a Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-06 18:39:42 +00:00
Aleksey Yeschenko cb429063c1 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-06 17:56:33 +00:00
Aleksey Yeschenko cfbe2d35b0 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-06 15:26:14 +00:00
Aleksey Yeschenko edca4dcecc Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-06 15:25:53 +00:00
Paulo Motta 9940892c3c Fix cqlsh type handling after driver metadata api change 
patch by Paulo Motta; reviewed by Aleksey Yeschenko
 2015-11-05 14:35:01 +00:00
Paulo Motta 1f1700a67c Follow-up to CASSANDRA-10513 2015-11-04 15:46:53 +00:00
Aleksey Yeschenko 1d340befaf Revert "Revert "Update cqlsh driver for new driver execution API"" 
This reverts commit 0fbf715916.
 2015-11-04 14:36:05 +00:00
Aleksey Yeschenko 9404fed01a Revert "Revert "Update cqlsh driver for new driver execution API"" 
This reverts commit 0fbf715916.
 2015-11-04 14:21:18 +00:00
Sylvain Lebresne f27cc7ef3c Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-30 14:52:53 +01:00
Sylvain Lebresne 0fbf715916 Revert "Update cqlsh driver for new driver execution API" 
This reverts commit acf67d559c.
 2015-10-30 14:51:26 +01:00
Sylvain Lebresne 10ef01d1ca Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-30 10:02:15 +01:00
Paulo Motta acf67d559c Update cqlsh driver for new driver execution API 
patch by aholmber; reviewed by pauloricardomg for CASSANDRA-10513
 2015-10-30 09:54:03 +01:00
Tyler Hobbs d856d3d7bb Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-27 09:12:22 -05:00
Tyler Hobbs 40cef770d0 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-27 09:11:57 -05:00
blerer a639808688 Merge branch cassandra-2.2 into cassandra-3.0 2015-10-23 09:44:01 +02:00
blerer a5053fd944 Add a check to cqlsh to require Python-2.7 
patch by Benjamin Lerer; reviewed by Stefania Alborghetti for CASSANDRA-10561
 2015-10-23 09:39:31 +02:00
Aleksey Yeschenko 174cea0091 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-14 16:39:24 +01:00
Aleksey Yeschenko 50da872f20 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-14 16:38:19 +01:00
Aleksey Yeschenko 6d0c96c4d6 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-14 15:22:49 +01:00
Aleksey Yeschenko 751e4f9e0d Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-14 15:21:08 +01:00
Tyler Hobbs 89596682e8 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-13 11:21:31 -05:00
Philip Thompson 22099addaf Cleanup whitespace for cqlsh PEP8 compliance 
patch by philipthompson; reviewed by Stefania for CASSANDRA-10455
 2015-10-07 10:20:52 +02:00
Robert Stupp 66c185d1a6 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-29 13:23:46 +02:00
Robert Stupp 13b4bb41c7 cqlsh prompt includes name of keyspace after failed `use` statement 
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-10369
 2015-09-29 13:22:21 +02:00
Sylvain Lebresne c38235d7cf Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2015-09-29 11:54:00 +02:00
Sylvain Lebresne 4595ec03f0 Configurable page size in cqlsh 
patch by enigmacurry; reviewed by philipthompson for CASSANDRA-9855
 2015-09-29 11:52:22 +02:00
Paulo Motta e25453ba55 Moved crc_check_chance out of compression options 
Patch by Paulo Motta; reviewed by Sam Tunnicliffe for CASSANDRA-9839
 2015-09-19 11:38:55 +01:00
Stefania Alborghetti aeee9f74d9 Add DESCRIBE MATERIALIZED VIEW to cqlsh 
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-9961
 2015-09-18 11:33:54 +02:00
blerer 90661a3259 Merge branch cassandra-2.2 into cassandra-3.0 2015-09-17 22:17:40 +02:00
blerer eecfb07d46 Merge branch cassandra-2.1 into cassandra-2.2 2015-09-17 22:13:49 +02:00
Stefania Alborghetti b4544846de Update cqlsh COPY for new internal driver serialization interface 
Patch by Stefania Alborghetti; reviewed by Adam Holmberg for CASSANDRA-10318
 2015-09-15 13:26:47 -04:00
Philip Thompson 72f2cc4b17 Make cqlsh PEP8 compliant (and other cleanups) - 2.2 patch 
patch by philipthompson; reviewed by Stefania for CASSANDRA-10066
 2015-09-11 16:47:18 +02:00
Tyler Hobbs b2b756013a Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-09 17:16:29 -05:00
blerer 464ca14aa8 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-04 21:35:19 +02:00
Jonathan Ellis b204803274 add CLEAR cqlsh command 
patch by Paul O'Fallon; reviewed by Stefania for CASSANDRA-10086
 2015-08-24 19:51:23 -05:00
Tyler Hobbs da3a5a7fa2 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-08-14 10:45:09 -05:00
Tyler Hobbs 8ffeebff63 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
	bin/cqlsh
 2015-08-07 15:34:16 -05:00
Joshua McKenzie 99decd8efa Fix handling of incorrect %z cqlshlib output on Windows 
Patch by jmckenzie; reviewed by aweisberg for CASSANDRA-9418
 2015-07-23 13:21:10 -04:00
T Jake Luciani 9dc8c21980 Fix cqlsh copy methods and timestamp format issues on windows 
patch by tjake; reviewed by Josh McKenzie for CASSANDRA-9795
 2015-07-17 13:00:38 -04:00