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

676 Commits

Author SHA1 Message Date
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
Stefania Alborghetti 81e520c54b (cqlsh) fix COPY using wrong variable name for time_format 
patch by Stefania Alborghetti; reviewed by Paulo Motta for
CASSANDRA-10633
 2015-11-06 15:22:42 +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
Robert Stupp 242b9738f2 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-04 23:29:44 +01:00
Robert Stupp 0ff13d2a68 get JEMAlloc debug output out of nodetool output 
patch by Robert Stupp; reviewed by Ariel Weisberg for CASSANDRA-10628
 2015-11-04 23:28:57 +01: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
Stefania Alborghetti 78810f2550 cqlsh: Fix NULL option in COPY cmds after CASS-10415 
Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for
CASSANDRA-10577
 2015-10-27 09:10:10 -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
Joshua McKenzie f807b8c6ed Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-19 15:11:43 -04:00
Joshua McKenzie 728f94e798 Make Windows -a startup skip VerifyPorts check entirely 
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524
 2015-10-19 15:11:07 -04:00
Joshua McKenzie 5f5e9602df Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-14 14:44:24 -04:00
Joshua McKenzie 78753263e5 Add -a option to skip TIME_WAIT port check on Windows startup 
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524
 2015-10-14 14:43:32 -04: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
Aaron Ploetz 3c0a1a5c1a (cqlsh) allow custom time_format for COPY TO 
patch by Aaron Ploetz; reviewed by Carl Yeksigian for CASSANDRA-8970
 2015-10-14 16:35:50 +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
Carl Yeksigian 626ac94cd5 (cqlsh) show partial trace if incomplete after max_trace_wait 
patch by Carl Yeksigian; reviewed by Paulo Motta for CASSANDRA-7645
 2015-10-14 15:16:31 +01:00
Tyler Hobbs 89596682e8 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-13 11:21:31 -05:00
Stefania Alborghetti a85afbc7a8 Update cqlsh COPY for new driver conn interface 
Patch by Stefania Alborghetti; reviewed by Paulo Motta for
CASSANDRA-10507
 2015-10-13 11:18:55 -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
blerer 4e3555c1d9 Make "truncate table X" an alias for "truncate X" 
patch by Benjamin Lerer; reviewed by Robert Stupp  for CASSANDRA-9585
 2015-09-17 22:02:45 +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
Sylvain Lebresne 30f39a2312 Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2015-09-11 16:48:43 +02: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
Philip Thompson 9faa193e9a Make cqlsh PEP8 compliant (and other cleanups) 
patch by philipthompson; reviewed by Stefania for CASSANDRA-10066
 2015-09-11 16:44:09 +02:00
Tyler Hobbs 55fb5cdf1c Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2015-09-09 17:17:52 -05:00
Tyler Hobbs b2b756013a Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-09 17:16:29 -05:00
Adam Holmberg acc08aeca4 cqlsh: Fix error when starting cqlsh with --debug 
Patch by Adam Holmberg; reviewed by Philip Thompson for CASSANDRA-10282
 2015-09-09 17:14:52 -05:00
blerer 6dd2413f89 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-04 21:37:41 +02:00
blerer 464ca14aa8 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-04 21:35:19 +02:00
Paulo Motta acdbdc28c4 Make cqlsh handle CREATE KEYSPACE timeouts properly 
patch by Paulo Motta; reviewed by Benjamin Lerer for CASSANDRA-9689
 2015-09-04 21:28:25 +02:00