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

497 Commits

Author SHA1 Message Date
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
Robert Stupp 615945d275 Aggregate with Initial Condition fails with C* 3.0 
patch by Robert Stupp; reviewed by Sylvain Lebresne for CASSANDRA-10367
 2015-10-20 17:45:30 +02: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
Aleksey Yeschenko 6af4657a96 Update bundled drivers for CASSANDRA-9664 2015-09-19 16:30:02 +01: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
Sam Tunnicliffe 106b1cdabe Don't allow secondary indexes on materialized views 
This commit also fixes a problem with AlterViewStatement not updating
view options correctly.

Patch by Sam Tunnicliffe and Paulo Motta; reviewed by Aleksey Yeschenko
for CASSANDRA-9921
 2015-09-18 11:47:02 +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
Aleksey Yeschenko 2db8370fdf Do not persist ReversedType in system_schema.columns 
patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for
CASSANDRA-6717
 2015-09-17 18:24:00 +01:00
Sam Tunnicliffe fde97c3b3d Remove target_columns from index metadata 
Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for
CASSANDRA-10216
 2015-09-16 17:25:23 +01:00
Carl Yeksigian a3a8dbca5c Improve MV schema representation 
patch by Carl Yeksigian; reviewed by Aleksey Yeschenko for
CASSANDRA-9921
 2015-09-16 15:34:18 +01:00
Aleksey Yeschenko 0790e48191 Modernize system_schema columns and triggers tables 
Patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for
CASSANDRA-6717
 2015-09-11 18:03:12 +01:00
Stefania Alborghetti ce63ccc842 Faster sequential IO (CASSANDRA-8630) 
Merge RandomAccessReader and NIODataInputStream class hierarchies
to share performance optimisation work across all readers.

patch by stefania; reviewed by ariel and benedict for CASSANDRA-8630
 2015-09-04 12:42:35 +01:00
Sam Tunnicliffe 07dfc208a4 Update bundled python driver to fix problem with missing blist dependency 2015-08-28 13:07:11 +01:00
Blake Eggleston 51bc7f87d7 Fix post-6717 driver issue with indexes 
patch by Blake Eggleston; reviewed by Aleksey Yeschenko for
CASSANDRA-10121
 2015-08-19 22:17:05 +03:00
Sam Tunnicliffe 06c130e3cb Move 2i metadata out of system_schema.columns and ColumnDefinition 
Patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko and Robert Stupp
for CASSANDRA-6717
 2015-08-18 14:59:44 +01:00
Adam Holmberg e58b7df935 Fix cqlsh DESCRIBE column order 
patch by Adam Holmberg; reviewed by Aleksey Yeschenko for CASSANDRA-9968
 2015-08-04 16:39:51 +03:00
Robert Stupp 1774eb9a86 Bytecode inspection for Java-UDFs 
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-9890
 2015-07-31 20:36:23 +02:00
Aleksey Yeschenko 7b35e3e843 Update the bundled java driver to fix failing pig tests 
patch by Aleksey Yeschenko for CASSANDRA-9841
 2015-07-23 22:00:17 +03:00
Aleksey Yeschenko dc8523819f Modernize system_schema.tables table 
patch by Aleksey Yeschenko; reviewed by Tyler Hobbs and Robert Stupp for
CASSANDRA-6717
 2015-07-18 00:14:08 +03:00
Ariel Weisberg 177e0dcbe4 For CASSANDRA-9499, update to OHC 0.4 that allow deserialization directly from ByteBuffers 2015-07-15 14:24:35 +01:00
Aleksey Yeschenko 7d6c876ec9 Move schema tables to the new system_schema keyspace 
patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-6717
 2015-07-10 15:28:37 +03:00
T Jake Luciani 8c22b4a81f Remove crc and adler reflection hacks 
patch by tjake; reviewed by benedict for CASSANDRA-9650
 2015-07-09 11:31:31 -04:00
Jeremiah Jordan 43c27e99f7 Update Guava to 18.0 
patch by Jeremiah Jordan; reviewed by Aleksey Yeschenko for
CASSANDRA-9653
 2015-07-07 02:41:57 +03:00
T Jake Luciani c5c9739392 Merge branch 'cassandra-2.2' into trunk 2015-07-06 12:26:32 -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
Aleksey Yeschenko 9627f13ef7 Delete lib/super-csv-2.1.0.jar (follow up to CASSANDRA-9035) 2015-07-01 20:13:49 +03:00
Stefania Alborghetti e89d54865e Change hinted_handoff_enabled yaml setting, JMX 
patch by Stefania Alborghetti; reviewed by Aleksey Yeschenko for
CASSANDRA-9035
 2015-07-01 19:43:33 +03: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
T Jake Luciani cdcf6461a3 Upgrade thrift to 0.9.2 
Patch by tjake; reviewed by Philip Thompson for CASSANDRA-8685
 2015-01-30 09:46:02 -05:00
T Jake Luciani 8896a70b01 Upgrade metrics library and remove depricated metrics 
Patch by tjake; reviewed by aleksey for CASSANDRA-5657
 2015-01-28 11:12:19 -05:00
Dave Brosius d4b23b0598 remove use of commons-logging in favor of jcl-over-slf4j 2015-01-22 21:40:32 -05:00
Dave Brosius b5721b5120 fix ohc license version 2015-01-21 22:07:56 -05:00
Tyler Hobbs 0c3720ab80 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2015-01-21 18:31:40 -06:00
Tyler Hobbs 7dc94abd57 Upgrade bundled python driver to badad6d40 
Patch by Tyler Hobbs for CASSANDRA-8563 and CASSANDRA-8372
 2015-01-21 18:30:44 -06:00
Robert Stupp dfd78d0e90 Serializing Row cache alternative, fully off heap 
Patch by Robert Stupp, reviewed by Ariel Weisberg for CASSANDRA-7438
 2015-01-21 20:50:35 +01:00
T Jake Luciani 3dd9c38a14 DirectByteBuffer compatible LZ4 methods 
Patch by Branimir Lambov; reviewed by tjake for CASSANDRA-7039
 2015-01-16 09:34:13 -05:00
Tyler Hobbs a10a2ba815 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	lib/cassandra-driver-internal-only-2.1.2.post.zip
 2014-12-18 12:38:47 -06:00
Tyler Hobbs d2583ce879 Upgrade bundled python driver to 2.1.3 
Patch by Tyler Hobbs. Fixes CASSANDRA-7623, and CASSANDRA-8288, CASSANDRA-8326
 2014-12-18 12:36:46 -06: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
Sylvain Lebresne 528cc3dd19 Merge branch 'cassandra-2.1' into trunk 2014-11-24 10:33:32 +01:00
Sylvain Lebresne 6ae1b420a6 Better jamm 0.3.0 jar 2014-11-24 10:32:46 +01:00
Tyler Hobbs f02d19451a Add missing jamm jar from CASSANDRA-8231 commit 2014-11-21 15:42:49 -06: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 3cc9a0c87f Temporary fix for CASSANDRA-8326 
This is a temporary python driver fix for CASSANDRA-8326.  The patch
has not been properly reviewed and tested by the python driver team.
The driver version bundled here can be found at the following branch:

https://github.com/thobbs/python-driver/tree/CASSANDRA-8326-temp-fix
 2014-11-18 15:36:47 -06:00
Dave Brosius d286ac7d07 fix license extension 2014-11-09 00:38:09 -05:00
Dave Brosius c832a36f25 route sigar's use of log4j thru slf4j 2014-11-08 23:12:04 -05: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
Tyler Hobbs 7c595cb809 Merge branch 'cassandra-2.1' into trunk 2014-10-29 18:45:14 -05:00
Tyler Hobbs 391f1d3bb6 cqlsh: upgrade bundled python driver to 2.1.2 
Patch by Tyler Hobbs for CASSANDRA-8031
 2014-10-29 18:42:06 -05:00
Robert Stupp b94c87a181 Update java driver to 2.1.2 
patch by snazy; reviewed by slebresne for CASSANDRA-7692
 2014-10-14 09:49:25 +02: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
Jake Luciani a848b08ceb Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/transport/Server.java
 2014-10-08 16:34:35 -04:00
Jake Luciani dacddd2668 Upgrade netty to 4.0.23 enable epoll 
Patch by tjake; reviewed by Jason Brown for CASSANDRA-7761
 2014-10-08 16:12:30 -04:00
Dave Brosius 2279d49e96 Allow cassandra to compile under java 8 
patch by dbrosius reviewed by jmckenzie for cassandra-7028
 2014-10-02 12:47:08 -05:00
Tyler Hobbs 56b7737936 Merge branch 'cassandra-2.1' into trunk 2014-10-01 12:30:09 -05:00
Tyler Hobbs 592672320d cqlsh: Fix IPv6 Support 
This commit upgrades the bundled datastax/python-driver to
ad2f61f8655.

Patch by Tyler Hobbs; reviewed by Philip Thompson for CASSANDRA-7988
 2014-10-01 12:27:39 -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
Dave Brosius 995904c2dd update thrift-server license file 2014-09-05 22:09:46 -04:00
Jason Brown 916efcb6fb Merge branch 'cassandra-2.1' into trunk 2014-09-05 16:48:17 -07:00
Jason Brown 8d69214197 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	build.xml
 2014-09-05 16:45:20 -07:00
Pavel Yaskevich e6f307f4e5 bump thrift-server version to 0.3.7 to properly shutdown invocation pool shutdown 
patch by Pavel Yaskevich; tested by Philip Thompson for CASSANDRA-7594
 2014-09-05 14:23:24 -07:00
Tyler Hobbs 0229323382 Merge branch 'cassandra-2.1' into trunk 2014-09-05 11:10:56 -05:00
Tyler Hobbs 037963c62f Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-09-05 11:10:31 -05:00
Tyler Hobbs c1dc378e0a Add cqlsh DESCRIBE support for frozen UDTs, tuples 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7863
 2014-09-05 11:09:59 -05:00
Dave Brosius 9b98fecc69 update thrift-server license to 0.3.6 2014-09-03 23:43:03 -04:00
Dave Brosius 65db2c7438 add license for javassist 2014-09-03 21:01:11 -04:00
Robert Stupp 511129ddbd Accept Java source code for user-defined functions 
Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7562
 2014-09-03 14:37:15 -05:00
Jason Brown 936dea8952 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2014-09-03 10:48:50 -07:00
Jason Brown cae8715750 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	build.xml
	lib/thrift-server-0.3.5.jar
	lib/thrift-server-0.3.6.jar
 2014-09-03 10:45:52 -07:00
Pavel Yaskevich b22089d7c8 Make disruptor_thrift_server invocation pool configurable 
patch by Pavel Yaskevich; reviewed by Jason Brown for CASSANDRA-7594
 2014-09-02 16:14:27 -07:00
Aleksey Yeschenko 78142080dd Merge branch 'cassandra-2.1' into trunk 2014-08-12 17:45:22 +03:00
Tyler Hobbs 0471f40648 (cqlsh) Fix DESCRIBE for NTS keyspaces 
patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7729
 2014-08-12 17:40:50 +03:00
Tyler Hobbs 049adcd831 Merge branch 'cassandra-2.1' into trunk 2014-08-01 18:10:21 -05:00
Tyler Hobbs fe78e81496 cqlsh: Upgrade bundled py driver to fix nulls in UDTS and tuples 
Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7656
 2014-08-01 18:08:19 -05:00
Tyler Hobbs 14826794c3 Merge branch 'cassandra-2.1' into trunk 2014-07-16 11:57:48 -05:00
Tyler Hobbs 88e05719b6 Update cqlsh python driver to 2.1 
Patch by Mikhail Stepura and Tyler Hobbs; reviewed by Aleksey Yeschenko
for CASSANDRA-7509
 2014-07-16 11:56:29 -05:00
Jonathan Ellis 36640fcac9 Merge branch 'cassandra-2.1' into trunk 2014-06-30 21:13:17 -07:00
Jonathan Ellis c23eccf3c6 Upgrade to snappy-java 1.0.5.2 2014-06-30 21:12:46 -07:00
Brandon Williams 1e819233f6 Merge branch 'cassandra-2.1' into trunk 2014-06-18 14:31:17 -05:00
Brandon Williams cf9b8c998f Upgrade to snappy 1.0.5.1 
Patch by Iheanyi Ekechukwu, reviewed by brandonwilliams for
CASSANDRA-7381
 2014-06-18 14:30:28 -05:00
Jake Luciani 805a4aeebe Merge branch 'cassandra-2.1' into trunk 2014-06-17 15:09:31 -04:00
Jake Luciani a3dc7b8b41 Upgrade netty to 4.0.20 2014-06-17 15:09:03 -04:00
Dave Brosius 43292388e2 Merge branch 'cassandra-2.1' into trunk 2014-06-05 23:31:46 -04:00
Dave Brosius 9b536eca9d update netty-all license 2014-06-05 23:30:59 -04:00
Jake Luciani 8a91a1a59e Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/transport/CBUtil.java
 2014-06-05 14:22:19 -04:00
Jake Luciani 4722fe70aa RefCount native frames from netty to avoid corruption bugs 
patch by tjake; reviewed by bes for CASSANDRA-7245
 2014-06-05 14:15:32 -04:00
Mikhail Stepura c6eaffc2a1 Merge branch 'cassandra-2.1' into trunk 2014-05-21 13:28:48 -07:00
Mikhail Stepura a3effe6698 Support new UDT serialization format for CQLSH 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7261
 2014-05-21 13:27:55 -07:00
Mikhail Stepura c2cfefc507 Merge branch 'cassandra-2.1' into trunk 2014-05-19 14:34:04 -07:00
Mikhail Stepura 0f706c528e Ninja: thrift-server-0.3.5.jar for CASSANDRA-6285 2014-05-19 14:33:19 -07:00
Mikhail Stepura f760e1f8b3 Merge branch 'cassandra-2.1' into trunk 2014-05-19 14:03:43 -07:00
Mikhail Stepura 98696714fb Ninja: removed old cassandra-dbapi licenses. Added new one for ptyhon-driver 2014-05-19 14:02:53 -07:00
Jake Luciani 4b8f667d04 Merge branch 'cassandra-2.1' into trunk 2014-05-14 09:06:34 -04:00
Jake Luciani 4ee372106f Followup commit to fix maven deps on boundary's NBHM for CASSANDRA-7128 2014-05-14 09:02:45 -04:00
T Jake Luciani 5c66dc819b Merge branch 'cassandra-2.1' into trunk 2014-05-05 17:13:08 -04:00
T Jake Luciani f0575f153b high-scale-lib upgrade 
Patch by tjake; reviewed by Benedict Elliott Smith for CASSANDRA-7128
 2014-05-05 16:37:22 -04:00
Dave Brosius a44ba68cf8 Merge branch 'cassandra-2.1' into trunk 2014-05-02 23:35:05 -04:00
Dave Brosius 9432870658 add license for commons-math3.3.2 2014-05-02 23:34:33 -04:00
Dave Brosius 5c2f89a0e9 Merge branch 'cassandra-2.1' into trunk 2014-05-02 23:08:30 -04:00
Dave Brosius 6708d05ec5 netty >= version 4.0 now has an artifact name of netty-all 2014-05-02 23:07:34 -04:00
Dave Brosius b6974fb94b Merge branch 'cassandra-2.1' into trunk 2014-05-02 22:54:26 -04:00
Dave Brosius df62c62617 fix logback version string typo: 1.1.12 s/b 1.1.2 2014-05-02 22:52:11 -04:00
Mikhail Stepura f0def34125 Merge branch 'cassandra-2.1' into trunk 2014-05-01 15:21:32 -07:00
Mikhail Stepura 31cd61387e Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-01 15:21:22 -07:00
Mikhail Stepura 26633caa9c Patched version of Disruptor Thrift Server 
patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-6545
 2014-05-01 15:03:24 -07:00
Dave Brosius 4d0691759a Allow cassandra to compile under java 8 
patch by dbrosius reviewed by jmckenzie for cassandra-7028
 2014-04-15 20:38:32 -04:00
Dave Brosius f3d8ecf84c update logback to version 1.1.2 2014-04-02 20:53:58 -04:00
belliottsmith cbf304ebd0 Update native server to Netty 4 
patch by benedict; reviewed by slebresne for CASSANDRA-6236
 2014-03-20 18:23:53 +01:00
Mikhail Stepura a2ceb22c59 Python-driver without a hard dependency on `scales` 2014-03-13 11:07:09 -07:00
Mikhail Stepura caf609cf6f Switch cqlsh from cassandra-dbapi2 to python-driver 
patch by Mikhail Stepura for CASSANDRA-6307; reviewed by Aleksey Yeschenko and Tyler Hobbs
 2014-03-12 15:02:14 -07:00
Jonathan Ellis f628bd8a4d Merge branch 'cassandra-2.0' into cassandra-2.1 2014-02-18 11:22:24 -06:00
Jonathan Ellis 500c62d6b9 Allow per-dc enabling of hints 
patch by Sankalp Kohli; reviewed by Lyuben Todorov for CASSANDRA-6157
 2014-02-18 11:21:13 -06:00
Sylvain Lebresne 1828b929c2 Remove now unused depency on snaptree 2014-02-17 17:23:04 +01:00
Jonathan Ellis ee020c9446 Revert 6157 until we can commit to 2.0 and merge forwards 
This reverts commit f64b31c426.
 2014-02-15 11:38:51 -06:00
Jonathan Ellis f64b31c426 wip 2014-02-15 10:18:12 -06:00
Mikhail Stepura 88bef0cbf3 Switched to Guava 16.0 for CASSANDRA-6639 2014-02-06 20:22:28 -08:00
Yuki Morishita 0f83a8610b update stream-lib for HLL++ serialization thread-safety 2014-02-05 20:44:20 -06:00
Jonathan Ellis 4b54b8acd2 remove Table.switchlock and introduce o.a.c.utils.memory package 
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-5549
 2014-01-30 17:09:18 -06:00
Jonathan Ellis 2ba394676d bundle jna 4.0 
patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-5872
 2014-01-28 16:41:33 -06:00
Jonathan Ellis 4edfe4ee78 add airline and javax.inject jars 2014-01-11 18:56:59 -06:00
Pavel Yaskevich 25d2893dd0 Merge branch 'cassandra-2.0' into trunk 2014-01-10 17:25:40 -08:00
Pavel Yaskevich c543215918 update thrift-server to version 0.3.3 to fix CASSANDRA-6373 and CASSANDRA-6407 2014-01-10 17:20:22 -08:00
belliottsmith 2e1e98ad04 Improve Stress Tool 
patch by Benedict; reviewed by Pavel Yaskevich for CASSANDRA-6199
 2013-12-23 18:05:43 -08:00
Yuki Morishita 642ce366d9 Add cardinality estimator for key count estimation 
patch by yukim; reviewed by jbellis for CASSANDRA-5906
 2013-12-20 14:14:46 -06:00
Dave Brosius 460fc03ee1 Merge branch 'cassandra-2.0' into trunk 2013-10-23 21:32:03 -04:00
Dave Brosius 3cf18d71dc update lz4 license to 1.2.0 2013-10-23 21:25:26 -04:00
Sylvain Lebresne 9bf5b45d88 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	build.xml
	lib/lz4-1.1.2.jar
 2013-10-23 11:25:12 +02:00
Sylvain Lebresne 93da683e0c Update LZ4 lib to 1.2.0 2013-10-23 11:20:23 +02:00
Brandon Williams 3017dd34f7 Merge branch 'cassandra-2.0' into trunk 2013-10-18 10:08:45 -05:00
Brandon Williams 718e3ec8b7 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-18 10:08:37 -05:00
Brandon Williams 300f153a71 match internal only filename to internal directory version 2013-10-18 10:08:25 -05:00
Jason Brown 231b345ffd Merge branch 'cassandra-2.0' into trunk 2013-10-17 14:09:45 -07:00
Jason Brown 20d91b0ba9 add update cql-internal-only zip 2013-10-17 14:06:29 -07:00
Jason Brown 5c0c84b3d1 implementing CL.LOCAL_ONE 2013-10-17 13:37:12 -07:00
Jonathan Ellis 023589bf30 Merge branch 'cassandra-2.0' into trunk 2013-10-01 14:25:57 -05:00
Jonathan Ellis 32c3f44a68 Add configurable metrics reporting 
patch by Chris Burroughs; reviewed by Tyler Hobbs for CASSANDRA-4430
 2013-10-01 14:25:42 -05:00
Jonathan Ellis 681312393b merge from 2.0 2013-09-19 16:54:26 -05:00
Pavel Yaskevich b4bc50e44d bump Distruptor Thrift Server version to 0.3.2 2013-09-19 14:08:38 -07:00
Jonathan Ellis b95fd08187 upgrade to CLHM 1.4 
patch by jbellis for CASSANDRA-5821
 2013-09-17 15:52:19 -05:00
Aleksey Yeschenko d57ce28450 Merge branch 'cassandra-2.0' into trunk 2013-09-12 18:45:34 +03:00
Aleksey Yeschenko 53f19c8495 Update guava to 15.0 2013-09-12 18:44:27 +03:00
Sylvain Lebresne 5ea3b15384 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	lib/licenses/slf4j-log4j12-1.7.2.txt
 2013-09-03 16:38:09 +02:00
Sylvain Lebresne a3534910e1 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-03 16:36:32 +02:00
Sylvain Lebresne 8c33e72e1f License filename renaming 2013-09-03 16:36:19 +02:00
Sylvain Lebresne 14e7895e59 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-03 16:35:27 +02:00
Sylvain Lebresne c7a835d1f4 Add back updated licenses 2013-09-03 16:30:10 +02:00
Sylvain Lebresne 4ca9217a2b Merge tag 'cassandra-2.0.0' into cassandra-2.0 
Apache Cassandra 2.0.0 release
 2013-09-03 16:28:57 +02:00
Sylvain Lebresne 196038b73e Update netty dependency to 3.6.6 2013-09-02 18:00:27 +02:00
Jonathan Ellis ca037b08e8 Merge branch 'cassandra-2.0' into trunk 2013-08-30 13:55:47 -05:00
Jonathan Ellis 583d98b475 rename license file 2013-08-30 13:55:45 -05:00
Jonathan Ellis 2be4241380 merge from 1.2 2013-08-30 13:55:06 -05:00
Jonathan Ellis de1a91fe5e Upgrade metrics-core to version 2.2.0 
patch by jbellis for CASSANDRA-5947
 2013-08-30 13:50:12 -05:00
Jonathan Ellis 3205e5dbbc Revert CASSANDRA-5838 2013-08-30 13:35:16 -05:00
Marcus Eriksson 14da6bca01 Switch to LZ4 compression for internode communication. 
Patch by marcuse, reviewed by jbellis for CASSANDRA-5887.
 2013-08-30 09:30:14 +02:00
Aleksey Yeschenko 84dfa06475 Merge branch 'cassandra-2.0' into trunk 2013-08-30 03:49:21 +03:00
Aleksey Yeschenko d6be037b37 Fix licenses 2013-08-30 03:48:45 +03:00
Aleksey Yeschenko 5b5d41d4b8 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
	tools/stress/src/org/apache/cassandra/stress/Session.java
	tools/stress/src/org/apache/cassandra/stress/StressStatistics.java
 2013-08-30 03:03:29 +03:00
Aleksey Yeschenko bffd9ea8eb Upgrade Thrift to 0.9.1 
patch by Carl Yeksigian and Jake Farrell; reviewed by Aleksey Yeschenko
for CASSANDRA-5923
 2013-08-30 02:57:12 +03:00
Sylvain Lebresne 03045ca22b Update versions for 2.0 final release 2013-08-28 13:37:31 +02:00
Dave Brosius 5e33b9b039 remove servlet-api and license, unused since avro removal 2013-08-21 22:17:00 -04:00
Dave Brosius 6f114c9318 Merge branch 'cassandra-2.0' into trunk 2013-08-21 21:53:01 -04:00
Dave Brosius 372af0854f Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-21 21:50:30 -04:00
Dave Brosius 4bc8c895db remove licenses for jars not used 2013-08-21 21:49:34 -04:00
Yuki Morishita 72a702a3d4 Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-21 15:41:05 -05:00
Yuki Morishita 0db3413548 add metrics-core license 2013-08-21 15:40:26 -05:00
Jonathan Ellis fa0b7cf8b2 add logback-classic jar 2013-08-15 11:41:54 -05:00