Commit Graph

337 Commits

Author SHA1 Message Date
Benjamin Lerer 8405f7366f Revert "upgrade JNA version to 4.4.0"
This reverts commit 3c81aa825d.
2017-05-31 15:14:22 +02:00
Benjamin Lerer 3c81aa825d upgrade JNA version to 4.4.0
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko  for CASSANDRA-13072
2017-05-31 14:37:10 +02:00
Robert Stupp f0f9cf232b Merge branch 'cassandra-2.1' into cassandra-2.2 2017-02-09 20:37:32 +01:00
Stefan Podkowinski eb0f443705 Upgrade netty to 4.0.44 to fix memory leak with client encryption
patch by Stefan Podkowinski; reviewed by Robert Stupp for CASSANDRA-13114
2017-02-09 20:36:07 +01:00
Stefan Podkowinski 3cda6829cc Add JVM metrics for custom metrics reporter
patch by Stefan Podkowinski; reviewed by tjake for CASSANDRA-12312
2016-08-05 11:03:14 -04:00
Stefania Alborghetti 3a7cfbd19b Merge branch 'cassandra-2.1' into cassandra-2.2 2016-07-25 08:40:35 +08:00
Stefania Alborghetti 3d3359eb95 cannot use cql since upgrading python to 2.7.11+
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11850
2016-07-25 08:39:12 +08:00
Dave Brosius da20fece74 update license txt file version numbers 2016-07-01 16:08:35 -04:00
Dave Brosius bd6ad43b9c update license file versions 2016-07-01 15:53:29 -04:00
Stefania Alborghetti 06bb6b9d09 Updated cqlsh Python driver to fix DESCRIBE problem for legacy tables
patch by Stefania Alborghetti; reviewed by Adam Holmberg for CASSANDRA-11055
2016-06-02 14:06:33 +02: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
Aleksey Yeschenko cb429063c1 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-06 17:56:33 +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 0fbf715916 Revert "Update cqlsh driver for new driver execution API"
This reverts commit acf67d559c.
2015-10-30 14:51:26 +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
T Jake Luciani be89dae3ec Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
	CHANGES.txt
2015-10-07 10:13:40 -04:00
Carl Yeksigian 1b08cbd817 Update python driver to 2.7.2
Patch by carl; reviewed by tjake for CASSANDRA-10161
2015-10-07 10:11:26 -04:00
T Jake Luciani ff74eaf0e0 Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
	CHANGES.txt
2015-07-06 12:26:01 -04:00
Tyler Hobbs db39257c34 cqlsh: Fix bad DESCRIBE CQL-compat check on COMPACT tables
Patch by Tyler Hobbs; reviewed by tjake for CASSANDRA-9647
2015-07-06 12:22:04 -04:00
T Jake Luciani 1e237d5a88 Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
	CHANGES.txt
2015-06-30 09:28:02 -04:00
blerer c65d81bfae Update internal python driver for cqlsh
patch by Benjamin Lerer; reviewed by tjake for CASSANDRA-9064
2015-06-30 09:25:10 -04: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
Robert Stupp c889bab221 ninja fix cqlsh's python driver 2015-06-23 21:59:16 +02: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
Robert Stupp a13399279b Rename class for DATE type in Java driver
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9563
2015-06-18 18:02:45 +02:00
Yuki Morishita 514dcd944c Add logback metrics
patch by yukim; reviewed by Jeremiah Jordan for CASSANDRA-9378
2015-06-16 17:39:00 -05:00
Robert Stupp 16b02887df Integrate pre-release Java Driver 2.2-rc1, custom build
patch by Robert Stupp; reviewed by Ariel Weisberg for CASSANDRA-9493
2015-06-04 11:17:05 +02: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
Robert Stupp 0282cd550c Use ecj instead of javassist for UDFs
patch by Robert Stupp; reviewed by Carl Yeksigian for CASSANDRA-8241
2015-05-15 17:28:21 +02:00
Ariel Weisberg 160e7f2945 faster async logback configuration for tests
patch by awiesberg; reviewed by beobal for CASSANDRA-9376
2015-05-15 11:20:35 -04:00
T Jake Luciani a2c05e2e3e Upgrade Snappy library
Patch by tjake; reviewed by thobbs for (CASSANDRA-9063)
2015-05-12 14:12:27 -04:00
Philip Thompson f698cc2284 Remove Thrift dependencies in bundled tools
patch by Philip Thompson; reviewed by Aleksey Yeschenko for
CASSANDRA-8358
2015-05-05 23:57:39 +03: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
Carl Yeksigian afe541a482 cqlsh: Add (LOCAL_)SERIAL consistency levels
Patch by Carl Yeksigian; reviewed by Stefania Alborghetti for
CASSANDRA-8051
2015-05-05 14:43:56 -05:00
Dave Brosius 792446a5a9 o.a.c.u.NoSpamLoggerTest uses slf4j's SubstituteLogger, which doesn't exist in 1.7.2
upgrade slf4j to 1.7.7 which has it.
2015-04-23 00:48:41 -04: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
Dave Brosius cbb982cc17 Merge branch 'cassandra-2.1' into trunk 2015-04-08 23:38:38 -04:00
Dave Brosius 7b83334f30 cassandra-7028 upgraded to antlr-3.5.2 and pulled in a hard org.antlr#stringtemplate dependency.
But antlr recursively pulls in an org.antlr#ST4 jar which is a complete duplicate of stringtemplate.
So stringtemplate.jar and ST4.jar provide duplicate sets of package/classes, which could cause problems.
Switch to only use ST4, as the normal recursive dependency brings in.
2015-04-08 23:12:37 -04:00
Tyler Hobbs addba6b56f Merge branch 'cassandra-2.1' into trunk 2015-04-01 13:04:17 -05:00
Blake Eggleston 2fa18d3a9f Upgraded bundled python driver to 2.5.0
Patch by Blake Eggleston; reviewed by Tyler Hobbs for CASSANDRA-9081 and
CASSANDRA-8919
2015-04-01 13:03:20 -05:00
T Jake Luciani a672097db4 bump metrics-reporter-config dependency
patch by tjake; reviewed by cburroughs for CASSANDRA-8149
2015-03-23 13:44:30 -04: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
T Jake Luciani 66a5d3bbe4 Make CRC32Ex into a separate maven dependency
Patch by tjake; reviewed by aweisberg for CASSANDRA-8836
2015-03-09 10:10:53 -04:00
Robert Stupp 0d2ec11c7e use preloaded jemalloc w/ Unsafe
Patch by Robert Stupp; Reviewed by Ariel Weisberg for CASSANDRA-8714
2015-03-05 10:57:03 +01:00
Tyler Hobbs 0af528b942 Merge branch 'cassandra-2.1' into trunk 2015-02-10 12:56:35 -06:00
Tyler Hobbs f5380de5e0 Upgrade bundled python driver to 077b876fdd38
Patch by Tyler Hobbs for CASSANDRA-8154
2015-02-10 12:55:01 -06:00
Robert Stupp 97d7d139f2 row cache: remove annoying classpath from "jemalloc not found" message
Patch by Robert Stupp; Reviewed by Aleksey Yeschenko
2015-01-31 18:47:02 +01:00
T Jake Luciani 0b324c5e55 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	build.xml
2015-01-30 12:02:42 -05:00