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

698 Commits

Author SHA1 Message Date
Paulo Motta 31c1958e2c Fix incorrect return code on SSTableVerify.bat 
Patch by pmotta; reviewed by pthompson for CASSANDRA-9941
 2015-08-03 14:43:15 -04:00
Joshua McKenzie 9ad133097b Add logdir and storagedir to nodetool.bat 
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-9696
 2015-07-23 13:23:55 -04: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
Andrew Tolbert 052222615a On Windows, wait 30 seconds on stop-server then terminate 
Patch by Andrew Tolbert; reviewed by jmckenzie for CASSANDRA-9791
 2015-07-13 17:53:42 -04:00
Stefania Alborghetti 19c00f7212 Backport CASSANDRA-9601 to 2.1 
Patch by Stefania Alborghetti; reviewed by Benjamin Lerer; backported by
Tyler Hobbs for CASSANDRA-9601
 2015-07-09 12:29:53 -05:00
Mike Adamson c5f03a9883 cqlsh: fix DESCRIBE KEYSPACES 
Patch by Mike Adamson; reviewed by Tyler Hobbs for CASSANDRA-9693
 2015-07-01 17:12:11 -05:00
Stefania Alborghetti 96e7e62642 (cqlsh) Allow setting the initial connection timeout 
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for
CASSANDRA-9601
 2015-07-01 19:04:56 +03:00
blerer 924d798a3e (cqlsh) Fix default CQL version 
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko for
CASSANDRA-9688
 2015-06-30 19:33:12 +03:00
Marcus Eriksson d6f9555ba6 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	bin/cqlsh
 2015-06-26 08:21:06 +02:00
Stefania Alborghetti 5d9729bc9b Added support for DESCRIBE INDEX and DESCRIBE <objectname> 
Patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-7814
 2015-06-26 08:18:15 +02:00
Jason Brown f4449bd455 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/tools/NodeProbe.java
 2015-06-25 10:45:02 -07:00
Jason Brown 628394a6fa Allow JMX over SSL directly from nodetool 
patch by Marcus Olsson, reviewed by jasobrown for CASSANDRA-9090
 2015-06-25 10:36:42 -07:00
Robert Stupp cfab9dac19 Update cqlsh for UDFs 
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-7556
 2015-06-23 19:19:57 +02:00
Josh McKenzie 2e92cf8996 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-06-12 18:18:45 -04:00
Philip Thompson c1702b0b3c Fix ipv6 parsing on Windows startup 
Patch by Philip Thompson; reviewed by jmckenzie for CASSANDRA-9567
 2015-06-12 18:17:13 -04:00
Jonathan Ellis efb08ad308 merge from 2.1 2015-06-08 09:34:52 -05:00
Jonathan Ellis 46ce21c7b7 merge from 2.0 2015-06-08 09:34:16 -05:00
Stefania Alborghetti a8ceb2c650 Added quotes to CLASSPATH and JAVA for nix scripts, CASSANDRA-9529 2015-06-08 09:29:10 -05:00
Jonathan Ellis c11644bbfb Merge branch 'cassandra-2.1' into cassandra-2.2 2015-06-01 10:27:55 -05:00
Jonathan Ellis 40c3ad6a0c merge from 2.0 2015-06-01 10:26:34 -05:00
Stefania Alborghetti b7adb03b41 Pass JVM_OPTS to standalone tools scripts, CASSANDRA-5969 2015-06-01 09:59:02 -05:00
Stefania Alborghetti 33d71b825f (cqlsh) Add support for native protocol 4 
patch by Stefania Alborghetti; reviewed by Aleksey Yeschenko for
CASSANDRA-9399
 2015-05-22 00:47:27 +03:00
Tyler Hobbs 1689e0adc7 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-05-15 11:44:38 -05:00
Tyler Hobbs 9f8c45d6d6 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-05-15 11:41:25 -05:00
Carl Yeksigian 0b92967d30 cqlsh: Add LOGIN command to switch users 
Patch by Sachin Janani and Carl Yeksigian; reviewed by Tyler Hobbs for
CASSANDRA-7212
 2015-05-15 11:36:06 -05:00
Tyler Hobbs 5b61545315 Merge branch 'cassandra-2.1' into trunk 2015-05-05 14:46:06 -05:00
Tyler Hobbs 22527730d3 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-05-05 14:45:40 -05:00
Tyler Hobbs e6bc6385ae Merge branch 'cassandra-2.1' into trunk 2015-04-22 10:50:55 -05:00
Tyler Hobbs 93b36d4b82 Fix write meter for cqlsh COPY TO 
Patch by Tyler Hobbs; reviewed by Stefania Alborghetti for
CASSANDRA-9217
 2015-04-22 10:41:41 -05:00
Tyler Hobbs 840d9a6632 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	bin/cqlsh
 2015-04-21 12:24:47 -05:00
Tyler Hobbs 49c1dbdad4 Fix whitespace, unused imports and variables in cqlsh 2015-04-21 12:20:37 -05:00
Joshua McKenzie 7f29201ce2 Revert "Add date and time types" on 2.1 branch 
This reverts commit 107545b392.

Conflicts:
	CHANGES.txt
	NEWS.txt
	bin/cqlsh
	pylib/cqlshlib/test/test_keyspace_init.cql
 2015-04-21 08:42:31 -05:00
Jim Witschey 23e77f10a4 Update cqlsh tests for latest trunk 
Patch by Jim Witschey; reviewed by Tyler Hobbs for CASSANDRA-9173
 2015-04-14 11:39:33 -05:00
Tyler Hobbs f9693d542e Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2015-04-07 16:27:52 -05:00
Tyler Hobbs cb8cb5f99d cqlsh: quote column names in COPY FROM inserts 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-9080
 2015-04-07 16:26:42 -05:00
T Jake Luciani b8717dc201 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
	NEWS.txt
	bin/cassandra.bat
	build.xml
	conf/cassandra-env.sh
	src/java/org/apache/cassandra/service/CassandraDaemon.java
 2015-04-01 11:11:53 -04:00
T Jake Luciani 150f827364 Merge branch 'cassandra-2.1.4-build' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	NEWS.txt
 2015-04-01 10:56:05 -04:00
T Jake Luciani 38a04eab6a Merge branch 'cassandra-2.0.14-build' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
 2015-04-01 10:45:51 -04:00
T Jake Luciani 2d7909dc12 New tool added to verify all data in sstables. 
Patch by Jeff Jirsa; reviewed by Branimir Lambov for CASSANDRA-5791
 2015-03-31 09:53:33 -04:00
T Jake Luciani 2433068c15 Bind JMX to localhost unless explicitly configured otherwise 2015-03-30 09:40:38 -04:00
T Jake Luciani c041ea8b37 Bind JMX to localhost unless explicitly configured otherwise 2015-03-30 09:38:50 -04:00
Tyler Hobbs dadc206c6e Merge branch 'cassandra-2.1' into trunk 2015-03-24 11:43:06 -05:00
Tyler Hobbs 9d2b2730eb Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	bin/cqlsh
 2015-03-24 11:42:38 -05:00
Philip Thompson 061ea33fde cqlsh: allow configuring CSV field size limit 
Patch by Philip Thompson; reviewed by Tyler Hobbs for CASSANDRA-8934
 2015-03-24 11:41:12 -05:00
Tyler Hobbs 237d0bc62e Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	bin/cqlsh
 2015-03-20 10:30:28 -05:00
Tyler Hobbs 7110904e40 Improve performance of cqlsh COPY FROM 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-8225
 2015-03-20 10:26:47 -05:00
Jonathan Ellis b25adc7657 Revert "nodetool command to validate all sstables in a node" 
This reverts commit 21bdf87006.

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
 2015-03-19 12:22:45 -05:00
Jeff Jirsa 21bdf87006 nodetool command to validate all sstables in a node 
patch by jeff jirsa; reviewed by branimir for CASSANDRA-5791
 2015-03-18 10:10:31 +00:00
Joshua McKenzie 3d11ec5dd3 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	pylib/cqlshlib/cql3handling.py
 2015-03-09 12:26:24 -05:00
Joshua McKenzie 107545b392 Add date and time types 
Patch by jmckenzie; reviewed by thobbs and cyeksigian for CASSANDRA-7523
 2015-03-09 12:20:28 -05:00
Tyler Hobbs 732e006388 Merge branch 'cassandra-2.1' into trunk 2015-02-12 12:33:47 -06:00
Tyler Hobbs 5c9d73209f ninja: fix cqlsh formatting of UDTs 
Follow-up to upgrade of the bundled python driver for CASSANDRA-8154
 2015-02-12 12:32:54 -06:00
Tyler Hobbs d76450c798 Merge branch 'cassandra-2.1' into trunk 2015-01-29 14:39:07 -06:00
Abhishek Gupta c49f6666e4 cqlsh: handle unicode BOM at the start of files 
Patch by Abhishek Gupta; reviewed by Tyler Hobbs for CASSANDRA-8638
 2015-01-29 14:37:55 -06:00
Aleksey Yeschenko 076b5bdd10 Merge branch 'cassandra-2.1' into trunk 2015-01-15 17:51:44 +03:00
Johnny Miller d406bab504 (cqlsh) Escape clqshrc passwords properly 
patch by Johnny Miller; reviewed by Aleksey Yeschenko for CASSANDRA-8618
 2015-01-15 17:50:35 +03:00
Sam Tunnicliffe 879b694d34 Introduce role based access control 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-7653
 2015-01-14 22:48:39 +03:00
Tyler Hobbs 1dcf66b093 Merge branch 'cassandra-2.1' into trunk 2015-01-02 12:15:11 -06:00
Tyler Hobbs aeb7d3f2ee cqlsh: handle schema mismatch on startup 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-8512
 2015-01-02 12:14:24 -06:00
Tyler Hobbs ba6e4239ec Merge branch 'cassandra-2.1' into trunk 2014-12-17 18:04:33 -06:00
Adam Holmberg c8b4d9568e cqlsh: fix CONSISTENCY output 
Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-8507
 2014-12-17 18:03:34 -06:00
Mikhail Stepura 3c955f447c Merge branch 'cassandra-2.1' into trunk 2014-12-17 15:51:12 -08:00
Sam Tunnicliffe f1e2fed8dd cqlsh doesn't handle LIST statements correctly. 
patch by Sam Tunnicliffe; reviewed by Mikhail Stepura for CASSANDRA-8370
 2014-12-17 15:50:59 -08:00
Joshua McKenzie d6528a7ebd Merge branch 'cassandra-2.1' into trunk 2014-12-05 14:20:43 -06:00
Joshua McKenzie 6e7a223175 Clean up string handling in powershell launch, check for JMX_PORT env var 
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-8423
 2014-12-05 14:19:28 -06:00
Aleksey Yeschenko cb8bda8d47 Merge branch 'cassandra-2.1' into trunk 2014-12-01 20:47:07 +03:00
Aleksey Yeschenko 37dfe43034 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-12-01 20:46:41 +03:00
Aleksey Yeschenko 902e43b935 Ninja-add missing consistency levels to cqlsh 2014-12-01 20:45:07 +03:00
Robert Stupp e13121318b Validate functionality of different JSR-223 providers in UDFs. 
patch by Robert Stupp; reviewed by Mikhail Stepura for CASSANDRA-7874
 2014-11-26 12:51:37 -08:00
Tyler Hobbs 699a69de8d Merge branch 'cassandra-2.1' into trunk 2014-11-21 15:40:53 -06:00
blerer 1bb2dd906c Fix size calculations for prepared statements 
Patch by Benjamin Lerer; reviewed by Dave Brosius for CASSANDRA-8231
 2014-11-21 14:54:47 -06:00
Tyler Hobbs fb4356a36a Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
	src/java/org/apache/cassandra/db/marshal/ListType.java
	src/java/org/apache/cassandra/db/marshal/TypeParser.java
	src/java/org/apache/cassandra/serializers/ListSerializer.java
	src/java/org/apache/cassandra/serializers/MapSerializer.java
 2014-11-11 13:33:31 -06:00
Tyler Hobbs ee55f361b7 Support for frozen collections 
Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-7859
 2014-11-11 12:40:48 -06:00
Mikhail Stepura eccf25a17e Merge branch 'cassandra-2.1' into trunk 2014-11-05 15:50:11 -08:00
Philip Thompson cdf80d9d19 (cqlsh) parse_for_table_meta errors out on queries with undefined grammars 
patch by Philip Thompson; reviewed by Mikhail Stepura for CASSANDRA-8262
 2014-11-05 15:49:59 -08:00
Jake Luciani 4fd3349e2e Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
 2014-11-05 15:44:03 -05:00
Jake Luciani 4f863be3f7 Fix Cassandra crash when running on JDK8 update 40 
Patch by Michael Schuler; reviewed by Robert Stupp (CASSANDRA-8209)
 2014-11-05 15:28:24 -05:00
Joshua McKenzie 374d0cbaed Merge branch 'cassandra-2.1' into trunk 2014-10-31 11:49:18 -05:00
Joshua McKenzie e3f4c6defc Abort startup if ports are in use (Windows) 
patch by jmckenzie, reviewed by pthompson for CASSANDRA-8179
 2014-10-31 11:47:11 -05:00
Joshua McKenzie 9089008007 Merge branch 'cassandra-2.1' into trunk 2014-10-24 11:05:13 -05:00
Joshua McKenzie 7cf3f19be0 Fix regression introduced by CASSANDRA-8115 
Patch by Josh McKenzie, reviewed by Philip Thompson for CASSANDRA-8115
 2014-10-24 11:03:22 -05:00
Joshua McKenzie a1f7ccfb24 Merge branch 'cassandra-2.1' into trunk 2014-10-22 13:42:48 -05:00
Joshua McKenzie b21bb3f1bb Ninja: fix foreground flag broken by 8115 2014-10-22 13:42:06 -05:00
Joshua McKenzie 7dda131a5f Merge branch 'cassandra-2.1' into trunk 2014-10-22 12:13:39 -05:00
Joshua McKenzie 51b27f2078 Fix installing as service on Windows 
Patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-8115
 2014-10-22 12:09:12 -05:00
Joshua McKenzie 861c4cf2de Integrate Sigar library and add basic OS performance checks on startup 
Patch by Amit Kumar and Josh McKenzie; reviewed by tjake for (CASSANDRA-7838)
 2014-10-09 12:32:57 -04:00
Jonathan Ellis 2fe5b9a82d Merge branch 'cassandra-2.1' into trunk 2014-10-09 07:26:03 -05:00
Jonathan Ellis f92a457a30 merge from 2.0 2014-10-09 07:25:51 -05:00
Jonathan Ellis fc0bb1520f Add sanity check of $JAVA on startup 
patch by Robert Stupp; reviewed by Michael Shuler for CASSANDRA-7676
 2014-10-09 07:24:19 -05:00
Joshua McKenzie 9c9279a29a Merge branch 'cassandra-2.1' into trunk 2014-10-02 14:28:53 -05:00
Joshua McKenzie cb8dc4eac0 Fix stop-server.bat with space in directory name. 
Patch by Josh McKenzie, reviewed by Philip Thompson for CASSANDRA-8044
 2014-10-02 14:28:11 -05:00
Joshua McKenzie 75c376db87 Merge branch 'cassandra-2.1' into trunk 2014-10-02 14:25:19 -05:00
Joshua McKenzie c4c56fa665 Make check for cygwin environment less greedy. 
Patch by Josh McKenzie, reviewed by Philip Thompson for CASSANDRA-8045
 2014-10-02 14:23:21 -05:00
Jonathan Ellis 67de6d30f3 Merge branch 'cassandra-2.1' into trunk 2014-10-01 12:35:54 -05:00
Jonathan Ellis 629c9a5957 merge from 2.0 2014-10-01 12:35:49 -05:00
Jonathan Ellis eed50a92e4 Increase nodetool Xmx 
patch by Nikolai Grigoriev; reviewed by jbellis for CASSANDRA-7956
 2014-10-01 12:34:52 -05:00
Aleksey Yeschenko 380273826d Remove cassandra-cli 
patch by Aleksey Yeschenko; reviewed by Brandon Williams and Jason Brown
for CASSANDRA-7920
 2014-09-24 18:33:29 -07:00
Mikhail Stepura e9f94447ed Merge branch 'cassandra-2.1' into trunk 2014-09-18 13:31:08 -07:00
Aaron Ploetz 146b8e3977 (cqlsh) Add command line option for cqlshrc file path. 
patch by Aaron Ploetz; reviewed by Mikhail Stepura for CASSANDRA-7131
 2014-09-18 13:30:43 -07:00
Joshua McKenzie 685140267e Merge branch 'cassandra-2.1' into trunk 2014-09-10 09:12:52 -07:00
Joshua McKenzie dbcc4eae6c Get Windows command-line flags in-line with linux 
patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-7748
 2014-09-10 09:10:52 -07:00
Mikhail Stepura b1774b7879 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	pylib/cqlshlib/cql3handling.py
 2014-09-09 15:13:12 -07:00
Mikhail Stepura 1456ec8318 (cqlsh) tab completion for triggers 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7824
 2014-09-09 15:03:57 -07:00
Joshua McKenzie 6cb1f0779a Merge branch 'cassandra-2.1' into trunk 2014-09-08 15:32:36 -05:00
Joshua McKenzie c1c3375361 Implement -f functionality in stop-server.bat 
patch by Philip Thompson; reviewed by Josh McKenzie for CASSANDRA-7901
 2014-09-08 15:30:20 -05:00
Mikhail Stepura f34e829a2f Merge branch 'cassandra-2.1' into trunk 2014-09-07 20:09:56 -07:00
Mikhail Stepura f1f5f5fd3a (cqlsh): Support for query paging 
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-7514
 2014-09-07 20:09:14 -07:00
Brandon Williams ed0532c64c Merge branch 'cassandra-2.1' into trunk 2014-09-02 12:48:45 -05:00
Brandon Williams e75fe5c4f5 Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-09-02 12:48:30 -05:00
Brandon Williams 82136e3b7e remove shuffle again 2014-09-02 12:47:55 -05:00
Mikhail Stepura b31787435a Merge branch 'cassandra-2.1' into trunk 2014-08-27 15:44:23 -07:00
Mikhail Stepura d01250d63a (cqlsh): Show progress of COPY operations. 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7789
 2014-08-27 15:43:42 -07:00
Mikhail Stepura bc9dc0f0a0 Merge branch 'cassandra-2.1' into trunk 2014-08-21 19:57:54 -07:00
Aaron Ploetz 854aab79b7 (cqlsh) Display the current logged-in user 
patch by Aaron Ploetz; reviewed by Mikhail Stepura for CASSANDRA-7785
 2014-08-21 19:57:20 -07:00
Tyler Hobbs df9cac094c Merge branch 'cassandra-2.1' into trunk 2014-08-21 14:00:50 -05:00
Tyler Hobbs d088f02993 Use python driver for UDTs in DESCRIBE output 
Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7659
 2014-08-21 13:59:26 -05:00
Tyler Hobbs 9a4f6bdf05 Merge branch 'cassandra-2.1' into trunk 2014-08-21 11:55:35 -05:00
Tyler Hobbs d586ea8980 cqlsh: Fix handling of CAS statement results 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7671
 2014-08-21 11:54:47 -05:00
Tyler Hobbs b42a15b896 Merge branch 'cassandra-2.1' into trunk 2014-08-20 17:52:04 -05:00
Tyler Hobbs 1aea6d5917 Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	bin/cqlsh
 2014-08-20 17:51:40 -05:00
Tyler Hobbs c4191ed1c9 cqlsh: preserve original result column names 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7806
 2014-08-20 17:46:41 -05:00
Mikhail Stepura c69f257f9e Merge branch 'cassandra-2.1' into trunk 2014-08-19 13:23:30 -07:00
Mikhail Stepura a323a1a6d5 (cqlsh) COPY TO/FROM improvements 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7405
 2014-08-19 13:22:24 -07:00
Tyler Hobbs 96addeedf6 Merge branch 'cassandra-2.1' into trunk 2014-08-19 14:55:30 -05:00
Tyler Hobbs 3a03d4bd55 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-19 14:55:04 -05:00
Tyler Hobbs 94262c4390 cqlsh: fix COPY FROM handling of null/empty PK values 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7792
 2014-08-19 14:53:57 -05:00
Aleksey Yeschenko e7d65346c2 Merge branch 'cassandra-2.1' into trunk 2014-08-18 22:01:35 +03:00
Aleksey Yeschenko bc165174b0 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-08-18 21:59:31 +03:00
Aleksey Yeschenko 36382e5472 (cqlsh) enable CTRL-R history search with libedit 
patch by Aleksey Yeschenko; reviewed by Jeremiah Jordan for
CASSANDRA-7577
 2014-08-18 21:52:19 +03:00
Mikhail Stepura 115bbe435b CQLSH: wait up to 10 sec for a tracing session. 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7222
 2014-08-15 14:53:13 -07:00
Mikhail Stepura 2d044e82a9 Merge branch 'cassandra-2.1' into trunk 2014-08-14 15:14:12 -07:00
Mikhail Stepura 7a1b6b40f7 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	bin/cqlsh
 2014-08-14 15:14:02 -07:00
Mikhail Stepura edb5f08833 Merge branch 'cassandra-2.1' into trunk 2014-08-14 14:33:17 -07:00
Robert Stupp 91e63d0546 Fixed the error when tracing query with cqlsh 
patch by Robert Stupp; reviewed by Mikhail Stepura for CASSANDRA-7613
 2014-08-14 14:31:48 -07:00
Mikhail Stepura e7566609e2 cqlsh should automatically disable tracing when selecting from system_traces 
patch by Philip Thompson and Mikhail Stepura; reviewed by Mikhail Stepura for CASSANDRA-7641
 2014-08-14 14:13:57 -07:00
Joshua McKenzie 384f873ce0 Prompt on missing dependency in cqlsh on Windows 
Patch by Josh McKenzie, reviewed by Jonathan Ellis for CASSANDRA-7749
 2014-08-12 02:28:51 +03:00
Joshua McKenzie 70d9f895da Prompt on missing dependency in cqlsh on Windows 
Patch by Josh McKenzie, reviewed by Jonathan Ellis for CASSANDRA-7749
 2014-08-11 15:30:19 -05:00
Mikhail Stepura 2809b06918 Merge branch 'cassandra-2.1' into trunk 2014-08-04 14:35:18 -07:00
Mikhail Stepura 1c1a40e10b Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-04 14:35:06 -07:00
Adam Holmberg 1c3de27376 cqlsh DESC CLUSTER fails retrieving ring information 
patch by Adam Holmberg; reviewed by mstepura for CASSANDRA-7687
 2014-08-04 14:34:27 -07:00
Mikhail Stepura be6cf8a325 Merge branch 'cassandra-2.1' into trunk 2014-08-02 17:09:11 -07:00
Mikhail Stepura 6b34d46c63 (cqlsh) Removed unused code for build number parsing 
patch by Mikhail Stepura; reviewed by  Jonathan Ellis for CASSANDRA-7524
 2014-08-02 17:08:18 -07:00
Jonathan Ellis 777384131b Merge branch 'cassandra-2.1' into trunk 2014-07-31 15:49:54 -05:00
Jonathan Ellis e3d5b98e48 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-31 15:49:47 -05:00
Jonathan Ellis abe85903b3 add cassandra.in.bat 2014-07-31 15:49:38 -05:00
Brandon Williams cf46e4454b Merge branch 'cassandra-2.1' into trunk 2014-07-31 15:13:57 -05:00
Brandon Williams da1f2dbb5e Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-31 15:13:48 -05:00
Brandon Williams 8e4415b697 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	bin/cassandra-shuffle.bat
 2014-07-31 15:13:37 -05:00
Brandon Williams 563a04bf98 remove shuffle bat 2014-07-31 15:12:28 -05:00