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

811 Commits

Author SHA1 Message Date
Sylvain Lebresne 5b7798cd5e Merge branch 'cassandra-2.1' into trunk 2014-07-01 15:41:26 +02:00
Sylvain Lebresne 277475837f Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-01 15:40:20 +02:00
Sylvain Lebresne fcd3cc0eb6 Make sure cql-test only run CQLTester ones 2014-07-01 15:38:51 +02:00
Benedict Elliott Smith 51cdeed483 Merge branch 'cassandra-2.1' into trunk 2014-06-30 14:31:52 +01:00
Benedict Elliott Smith e77ea12520 Optimise CellName/Composite comparisons for NativeCell 
patch by Jake Luciani and Benedict Elliott Smith for CASSANDRA-6755
 2014-06-30 14:30:55 +01:00
Jonathan Ellis c027183ea4 fix build on os x 2014-06-27 16:35:28 -05:00
Sylvain Lebresne 79f3874d81 Versions update for 2.0.9 release 2014-06-26 10:34:53 +02:00
Jake Luciani 8322ec27ca Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
	test/unit/org/apache/cassandra/cli/CliTest.java
 2014-06-25 17:46:07 -04:00
Jake Luciani 23893ead55 Paralellize the unit tests 
patch by tjake; reviewed by thobbs for CASSANDRA-7442
 2014-06-25 17:09:31 -04:00
Brandon Williams eb396399ce Exclude stress/thrift from jacoco 
Patch by Russ Hatch, reviewed by brandonwilliams for CASSANDRA-7226
 2014-06-25 13:43:38 -05:00
Brandon Williams 33c5e19a26 Rename code coverage test. 
Patch by Russ Hatch, reviewed by brandonwilliams for CASSANDRA-7226
 2014-06-24 11:14:05 -05:00
Sylvain Lebresne e2bef02e25 Update versions for 2.1.0-rc2 release 2014-06-23 19:00:07 +02:00
Brandon Williams e77b70eecc Allow browsing in jacoco-report 
Patch by Russ Hatch, reviewed by brandonwilliams for CASSANDRA-7226
 2014-06-20 11:37:22 -05:00
Russ Hatch 46c3896c62 enable code coverage using JaCoCo 
patch by rhatch reviewed by dbrosius for cassandra-7226
 2014-06-18 22:32:11 -04: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
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
Sylvain Lebresne 99ba549d0d Merge branch 'cassandra-2.1' into trunk 2014-06-05 08:40:27 +02:00
Sylvain Lebresne 78e91c4cac Reduce run time for CQL tests 
patch by slebresne; reviewed by thobbs for CASSANDRA-7327
 2014-06-05 08:39:48 +02:00
Brandon Williams ce248f227b Merge branch 'cassandra-2.1' into trunk 2014-05-30 17:52:32 -05:00
Brandon Williams e56a64edb0 Upgrade to Pig 0.12.1 
Patch by brandonwilliams for CASSANDRA-6556
 2014-05-30 17:52:08 -05:00
Mikhail Stepura e91bf8f3ea Merge branch 'cassandra-2.1' into trunk 2014-05-30 11:00:14 -07:00
Sylvain Lebresne c108ce5bf2 Licenses and versions in preparation of 2.1rc1 release 2014-05-30 17:27:53 +02:00
Sylvain Lebresne 56c2f0ab11 Merge branch 'cassandra-2.1' into trunk 2014-05-29 11:36:28 +02:00
Sylvain Lebresne 0932ed670c Tuple types 
patch by slebresne; reviewed by thobbs for CASSANDRA-7248
 2014-05-29 11:33:11 +02:00
Dave Brosius 079de5ba91 Merge branch 'cassandra-2.1' into trunk 2014-05-28 06:46:11 -04:00
Dave Brosius 6d1500c501 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-28 06:45:39 -04:00
Oded Peer 0c96f99e48 add src/resources to the generate eclipse .project file's src paths 
patch by opeer reviewed by dbrosius for cassandra-5964
 2014-05-28 06:44:04 -04:00
Jonathan Ellis 4a6525655c Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-28 11:51:55 +02:00
Jonathan Ellis 5d40dffabe xmx 2014-05-28 11:51:41 +02: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
Brandon Williams 61084fb53b Merge branch 'cassandra-2.1' into trunk 2014-05-19 13:59:20 -05:00
Brandon Williams 606bc51e0d Switch disruptor to 0.3.5 2014-05-19 13:58:57 -05:00
Brandon Williams 1cfa56100c Merge branch 'cassandra-2.1' into trunk 2014-05-14 13:27:49 -05:00
Brandon Williams a680f721b0 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-14 13:27:34 -05:00
Brandon Williams 2092da0974 Exclude xerces to fix hadoop build issue. 
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6877
 2014-05-14 13:26:18 -05: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
Sylvain Lebresne d24513e046 Remove duplicate compiler flag 2014-05-13 14:07:00 +02:00
Sylvain Lebresne 3b949c2d1c Merge branch 'cassandra-2.1' into trunk 2014-05-13 14:06:25 +02:00
Sylvain Lebresne 09feef30bc Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-13 14:06:10 +02:00
Sylvain Lebresne 256109c34f Quiet the unsafe use warning during build 2014-05-13 14:05:54 +02:00
Brandon Williams 9224dd5cf3 Merge branch 'cassandra-2.1' into trunk 2014-05-06 13:48:14 -05:00
Brandon Williams ef92bb5f33 disable boundary repo temporarily 2014-05-06 13:48:06 -05:00
Sylvain Lebresne 006853300f Versions and NEWS update for 2.0.8 release 2014-05-06 10:29:53 +02:00
Dave Brosius 754643c5e4 Merge branch 'cassandra-2.1' into trunk 2014-05-06 01:37:15 -04:00
Dave Brosius aa3c10dd0c fix group id (com.boundary) for high-scale-lib 2014-05-06 01:36:53 -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
Jonathan Ellis b8c0199c33 Merge branch 'cassandra-2.1' into trunk 2014-05-02 22:49:44 -05:00
Jonathan Ellis 8e897de687 merge from 2.1 2014-05-02 22:49:31 -05:00
Jonathan Ellis fab45571b8 give some antlr targets more heap space 2014-05-02 22:41:14 -05: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
Dave Brosius e460e6c6b4 Merge branch 'cassandra-2.1' into trunk 2014-05-02 20:44:54 -04:00
Dave Brosius 93fef85056 switch to using jamm with groupId com.github.jbellis, as this one is published for 0.2.6 2014-05-02 20:44:25 -04:00
Sylvain Lebresne d8490ccea1 Merge branch 'cassandra-2.1' into trunk 2014-05-01 18:00:31 +02:00
Sylvain Lebresne 48727b4ccb Update versions and add licenses for 2.1-beta2 release 2014-05-01 16:40:15 +02:00
Sylvain Lebresne 6b4d980357 Merge branch 'cassandra-2.1' into trunk 2014-04-30 20:22:53 +02:00
Sylvain Lebresne 9872b74ef2 Native protocol v3 
patch by slebresne; reviewed by thobbs for CASSANDRA-6855
 2014-04-30 20:21:35 +02:00
Dave Brosius afe2e14079 quell all the 'internal proprietary API' warnings induced by Unsafe and friends 2014-04-28 23:14:05 -04: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
Sylvain Lebresne 7dbbe9233c Update versions for 2.0.7 release 2014-04-14 16:43:46 +02:00
Tyler Hobbs 9e2eca3daa Merge branch 'cassandra-2.1' into trunk 2014-04-08 12:26:38 -05:00
Tyler Hobbs 0fa5cba35b Merge branch 'cassandra-2.0' into cassandra-2.1 2014-04-08 12:26:09 -05:00
Tyler Hobbs 84daab53ea Avoid build failure due to ANTLR timeout 
Patch by Ben Chan; reviewed by Tyler Hobbs for CASSANDRA-6991
 2014-04-08 12:25:21 -05:00
Dave Brosius 6471d0caa4 Merge branch 'cassandra-2.1' into trunk 2014-04-02 20:55:46 -04:00
Dave Brosius f3d8ecf84c update logback to version 1.1.2 2014-04-02 20:53:58 -04:00
Dave Brosius eeef4061b7 Merge branch 'cassandra-2.1' into trunk 2014-03-28 21:14:04 -04:00
Dave Brosius 6844462898 snaptree is no longer a dependency in 2.1 and forwards 2014-03-28 21:13:21 -04:00
Sylvain Lebresne 3d399259d8 Merge branch 'cassandra-2.1' into trunk 2014-03-26 15:38:31 +01:00
Sylvain Lebresne 7b32dbd4db Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	build.xml
 2014-03-26 15:38:13 +01:00
Sylvain Lebresne d7cb970053 Add CqlRecordReader to take advantage of native CQL pagination 
patch by alexliu68; reviewed by pkolaczk for CASSANDRA-6311
 2014-03-26 15:34:59 +01:00
Sylvain Lebresne 48bf2b1317 Merge branch 'cassandra-2.1' into trunk 2014-03-25 16:53:38 +01:00
Sylvain Lebresne 6df3163752 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	build.xml
 2014-03-25 16:52:21 +01:00
Sylvain Lebresne b0841d8fee Revert "Add CqlRecordReader to take advantage of native CQL pagination" 
This reverts commit 3b708f9989.

Conflicts:

	CHANGES.txt
 2014-03-25 16:49:10 +01:00
Sylvain Lebresne 66b304e8c7 Merge branch 'cassandra-2.1' into trunk 2014-03-21 15:31:41 +01:00
Sylvain Lebresne a7c4659dbd Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	build.xml
 2014-03-21 15:31:25 +01:00
Sylvain Lebresne 3b708f9989 Add CqlRecordReader to take advantage of native CQL pagination 
patch by alexliu68; reviewed by pkolaczk for CASSANDRA-6311
 2014-03-21 15:26:41 +01:00
Jonathan Ellis c3d9280e45 Merge branch 'cassandra-2.1' into trunk 2014-03-17 11:37:16 -05:00
Jonathan Ellis dd60ab4740 fix CRLF in bash scripts when building on Windows 
patch by Peter; reviewed by Joshua McKenzie for CASSANDRA-6798
 2014-03-17 11:37:10 -05:00
Mikhail Stepura 510ffca9c9 Merge branch 'cassandra-2.1' into trunk 2014-03-14 13:51:42 -07:00
Mikhail Stepura 22b271689b Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-14 13:51:29 -07:00
Mikhail Stepura 245038fd25 Fix "codecoverage" task 2014-03-14 13:49:49 -07:00
Dave Brosius 8955a4658e Merge branch 'cassandra-2.1' into trunk 2014-03-14 00:47:29 -04:00
Dave Brosius 729da03c53 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-14 00:46:32 -04:00
Dave Brosius c49d33633a fix duplicate classes between cassandra-all and cassandra-thrift 
patch by dbrosius reviewed by jbellis for CASSANDRA-5833
 2014-03-14 00:43:10 -04:00
Sylvain Lebresne 656edc529d Update version, news and license for 2.0.6 2014-03-07 13:20:03 +01:00
Tyler Hobbs 9371892374 Merge branch 'cassandra-2.1' into trunk 2014-03-06 11:55:59 -06:00
Jonathan Ellis 728f677b0f Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-06 09:40:56 -06:00
Jonathan Ellis c2ec94b354 update cobertura version 
patch by Ed Capriolo for CASSANDRA-6800
 2014-03-06 09:40:46 -06:00
Brandon Williams 7c7193769c Merge branch 'cassandra-2.1' into trunk 2014-03-05 12:55:30 -06:00
Brandon Williams 4cf8a8a6c3 Add hadoop progressable compatibility. 
Patch by Ben Coverston, reviewed by brandonwilliams for CASSANDRA-5201
 2014-03-05 12:54:42 -06:00
Brandon Williams 249230834c Add hadoop progressable compatibility. 
Patch by Ben Coverston, reviewed by brandonwilliams for CASSANDRA-5201
 2014-03-05 11:21:35 -06:00
Brandon Williams 4cd434f465 Merge branch 'cassandra-2.1' into trunk 2014-02-25 15:52:13 -06:00
Brandon Williams 7bd23316e9 Add new stress deps to packaging. 
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6762
 2014-02-25 15:51:25 -06:00
Aleksey Yeschenko 2621707128 Remove CQL2 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5918
 2014-02-20 22:36:28 +03: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
Sylvain Lebresne 9f14856234 Versions and licenses in preparation for 2.1.0-beta1 release 2014-02-17 17:06:10 +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 21ec021831 Fix eclipse build for trunk 2014-02-14 12:08:26 -08:00
Brandon Williams f007a35357 Use EB HadoopCompat for compat with Hadoop 0.2.x 
Patch by Ben Coversaton, reviewed by brandonwilliams for CASSANDRA-5201
 2014-02-11 15:53:43 -06:00
Brandon Williams b9aece45e9 Use EB HadoopCompat for compat with Hadoop 0.2.x 
Patch by Ben Coversaton, reviewed by brandonwilliams for CASSANDRA-5201
 2014-02-11 09:34:49 -06:00
Brandon Williams 01cf29c3e9 Merge branch 'cassandra-2.0' into trunk 2014-02-07 13:19:50 -06:00
Brandon Williams 130d135a63 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-02-07 13:19:38 -06:00
Brandon Williams c70f6d80bd add target to run specific test methods 2014-02-07 13:19:26 -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
Sylvain Lebresne 178e086f1a Update news, version in preparation for 1.2.15 2014-02-05 08:47:20 +01:00
Aleksey Yeschenko aa29b6af6a Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	build.xml
	src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
	src/java/org/apache/cassandra/db/context/CounterContext.java
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
 2014-02-02 02:37:14 -05:00
Brandon Williams 944c015175 unify test timeouts, exclude pig 2014-01-31 22:11:01 +01:00
Brandon Williams 8ecc6f1118 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-01-31 14:08:15 -06:00
Brandon Williams 3f9875c7f5 exclude pig from test target 2014-01-31 14:08:07 -06:00
Brandon Williams 23e86ee15c Merge branch 'cassandra-1.2' into cassandra-2.0 2014-01-31 12:20:41 -06:00
Brandon Williams 9a024b8018 unify test timeouts, exclude pig 2014-01-31 12:20:18 -06:00
Sylvain Lebresne bcb294de08 Update version for 2.0.5 release 2014-01-31 16:06:12 +01:00
Sylvain Lebresne 6a9314408c Update versions and licenses for 1.2.14 release 2014-01-31 10:45:03 +01: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
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
Jonathan Ellis 892d8e699c refactor nodetool, encapsulating each command into a subclass 
patch by Clément Lardeur; reviewed by Mikhail Stepura for CASSANDRA-6381
 2014-01-10 12:12:34 -06:00
Eric Evans d56f8f2930 Update versioning for 2.0.4 release 2013-12-27 12:42:15 -06:00
belliottsmith 2e1e98ad04 Improve Stress Tool 
patch by Benedict; reviewed by Pavel Yaskevich for CASSANDRA-6199
 2013-12-23 18:05:43 -08:00
Dave Brosius 27dea4b938 add stream.jar to the poms 2013-12-22 00:17:14 -05:00
Brandon Williams 343a6472d8 Pig: fix duplicate schema error 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6309
 2013-12-13 11:40:20 -06:00
Sylvain Lebresne 6ab82a4698 Update versions for 1.2.13 release 2013-12-11 15:17:25 +01:00
Brandon Williams f7efaffada Pig: fix duplicate schema alias 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6309
 2013-12-05 16:14:43 -06:00
Jonathan Ellis 57e959d88a Merge branch 'cassandra-2.0' into trunk 2013-11-27 10:44:21 -06:00
Jonathan Ellis ef33f9543e move pig-test out of normal unit tests (still part of test-all) 2013-11-27 10:43:45 -06:00
Sylvain Lebresne c11bbecec8 Update version for 2.0.3 release 2013-11-21 10:07:40 +01:00
Sylvain Lebresne 026865f2a3 Update versions, licenses for 1.2.12 release 2013-11-20 09:43:28 +01: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
Sylvain Lebresne f895ad4f0f Merge branch 'cassandra-2.0' into trunk 2013-10-23 10:22:28 +02:00
Sylvain Lebresne f8027ed8c8 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-23 10:22:12 +02:00
Sylvain Lebresne f388a2eb88 Use smaller stack size for tests 2013-10-23 10:21:48 +02:00
Sylvain Lebresne b6147c1c7b License and versions for 2.0.2 release 2013-10-22 18:01:51 +02:00
Jonathan Ellis 78cad84aee Merge branch 'cassandra-2.0' into trunk 2013-10-17 23:11:41 +01:00
Jonathan Ellis 229da37256 merge from 1.2 2013-10-17 23:10:38 +01:00
Jonathan Ellis c5368c70f2 Add a warning for small LCS sstable size 
patch by jbellis; reviewed by Jeremiah Jordan for CASSANDRA-6191
 2013-10-17 23:09:36 +01:00
Sylvain Lebresne 6165840f15 Versions and license for 1.2.11 release 2013-10-15 09:21:10 +02:00
Brandon Williams 0f13031023 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	build.xml
	test/conf/log4j-junit.properties
 2013-10-14 14:19:20 -05:00
Brandon Williams fe598e77e6 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	build.xml
	src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
 2013-10-14 14:17:05 -05:00
Brandon Williams 4e35969795 Add PigUnit unit tests. 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-5695
 2013-10-14 14:13:18 -05:00
Dave Brosius a50c4faeb0 upgrade jsr-305 to 2.0.2 2013-10-09 19:20:16 -04:00
Brandon Williams 5af0c5c22f Upgrade pig to 0.11.1 2013-10-09 17:00:13 -05: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
Dave Brosius 65166aa861 add jsr305.jar build dep, to quell CNFE warnings on GuardedBy annotations 2013-09-21 00:29:02 -04:00
Sylvain Lebresne eb96db6c19 Update versions for 2.0.1 release 2013-09-20 12:19:34 +02: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
Sylvain Lebresne 937536363a Update version for 1.2.10 release 2013-09-19 11:59:58 +02:00
Brandon Williams 816c032186 update version to 2.1 2013-09-12 11:15:15 -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
Jonathan Ellis 3d9c3dd3af update build.xml for metrics-core 2.2.0 2013-09-05 11:04:26 -05: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 14e7895e59 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-03 16:35:27 +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
Dave Brosius 8f202895ab Merge branch 'cassandra-2.0' into trunk 2013-09-01 01:22:41 -04:00
Dave Brosius d4884c76c7 make sure c* returns the correct version when running inside an IDE (for cqlsh) 
patch by dbrosius reviewed by jbellis for cassandra-5964
 2013-09-01 01:20:29 -04: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
Dave Brosius 164f158662 Merge branch 'cassandra-2.0' into trunk 2013-08-29 21:16:09 -04:00
Dave Brosius e7693fa92d update pom dependencies for commons-lang3 2013-08-29 21:14:56 -04: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
Sylvain Lebresne 6164d011ee Versions for 1.2.9 release 2013-08-26 19:33:02 +02:00
Dave Brosius 99b5040403 Merge branch 'cassandra-2.0' into trunk 2013-08-21 20:52:39 -04:00
Dave Brosius 8551ff93e9 update version of snakeyaml to 1.11 for maven for cassandra-5917 2013-08-21 20:45:17 -04:00
Dave Brosius 5ba0b96d92 update apache rat to 0.10 2013-08-20 18:19:36 -04:00
Sylvain Lebresne 883ed60ef4 Merge branch 'cassandra-2.0' into trunk 2013-08-19 17:21:50 +02:00
Sylvain Lebresne 3e516a3287 Update versions for 2.0.0 RC2 release 2013-08-19 17:01:20 +02:00
Dave Brosius 0e4bd46c68 one version of servlet-api is more than enough, remove the second 2013-08-17 01:29:12 -04:00
Dave Brosius 6da81cd5cc don't pull in slf4j-log4j12.jar dependency from thrift-server 2013-08-16 02:28:17 -04:00
Dave Brosius 29605aedd9 switch logging from log4j to logback 
patch by dbrosius reviewed by jbellis for cassandra-5883
 2013-08-15 06:54:37 -04:00
Dave Brosius c27a161920 update metrics-core to 3.0.1 
patch by dbrosius reviewed by jbellis for cassandra-5838
 2013-08-10 10:34:07 -04:00
Pavel Yaskevich 19767fcd17 fix HsHa to respect max frame size 
patch by Pavel Yaskevich; reviewed by Tyler Hobbs (CASSANDRA-4573)
 2013-08-06 15:20:48 -07:00
Eric Evans e8ae6720e5 updated versioning for 2.0.0 rc1 release 2013-08-05 10:17:47 -05:00
Jason Brown 98214bb6a0 Merge branch 'cassandra-1.2' into trunk 2013-08-02 11:02:49 -07:00
Jason Brown 88bc4f2379 compile stress classes with debug symbols (so you can see the line numbers on stack traces) 2013-08-02 11:01:52 -07:00
Eric Evans 0291d69601 update versioning for 1.2.8 release 2013-07-27 19:38:15 -04:00
Sylvain Lebresne ae62c947fc Update versions for 1.2.7 release 2013-07-23 15:44:09 +02:00
Sylvain Lebresne e0eacd2818 Version and licenses for 2.0.0-beta2 2013-07-22 16:58:14 +02:00
Pavel Yaskevich cf96baa6dd bump thrift-server version to 0.2.1 2013-07-18 12:24:03 -07:00
Jason Brown 47ac42fdbb Expire entries out of ThriftSessionManager (round two, for THsHaDisruptorServer on trunk) 
patch by jasobrown; reviewed by jbellis for CASSANDRA-5719
 2013-07-10 07:00:15 -07:00
Sylvain Lebresne fcdb39384e Version and licenses for 2.0.0-beta1 release 2013-07-09 10:31:31 +02:00
Sylvain Lebresne fc8b76f79e Renames post 4495 2013-07-08 19:39:25 +02:00
Sylvain Lebresne e9c674242b Don't tie client side use of AbstractType to JDBC 
patch by carlyeks; reviewed by ardot for CASSANDRA-4495
 2013-07-08 18:36:56 +02:00
Dave Brosius c66ee7884f remove unused dependencies (aws-s3, opt-simple, whirr-cli, whirr-core) 2013-06-21 18:00:26 -04:00
Jonathan Ellis 362473fb37 match dependency to shipped version 2013-06-21 13:32:25 -05:00
Sylvain Lebresne 79410e4a88 Versions and license for 1.2.6 release 2013-06-21 19:12:31 +02:00
Pavel Yaskevich 98eec0a223 Replace Thrift HsHa with LMAX Disruptor based implementation 
patch by Pavel Yaskevich; reviewed by Aleksey Yeschenko for CASSANDRA-5582
 2013-06-07 15:36:48 -07:00
Dave Brosius 364c6226ce the commons-lang dependency is 2.6 2013-06-04 01:08:21 -04:00
Aleksey Yeschenko db4c27e91b Merge branch 'cassandra-1.2' into trunk 2013-06-04 04:46:51 +03:00
Aleksey Yeschenko 15dfdef017 Merge branch 'cassandra-1.1' into cassandra-1.2 2013-06-04 04:43:24 +03:00
Aleksey Yeschenko 99824496aa Set -Djava.awt.headless=true for ant test 
Makes running tests less annoying with OS X/Java7
 2013-06-04 04:42:07 +03:00
Aleksey Yeschenko 6f5d8a56fc Ninja-kill what's left from avro 2013-05-31 04:05:07 +03:00
Yuki Morishita b3101a17ae target 2.0 to run on java7 and above 2013-05-29 11:41:08 -05:00
Dave Brosius bbbbf3ae3d fix test-clientutil-jar target 2013-05-23 15:09:31 -04:00
Sylvain Lebresne 0db9406955 Updates news file, version and missing licenses for 1.1.12 release 2013-05-22 09:10:40 +02:00
Yuki Morishita 8b410078a4 Merge branch 'cassandra-1.2' into trunk 2013-05-17 10:29:10 -05:00
Yuki Morishita b69c1aa4cc snappy-java upgrade to 1.0.5 2013-05-17 10:27:25 -05:00
Marcus Eriksson 90764b0ac7 fix bad merge 2013-05-04 21:23:24 +02:00
Marcus Eriksson ec5f416a46 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	build.xml
	src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
	test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java
 2013-05-04 20:42:25 +02:00
Sylvain Lebresne de98541708 Update version for 1.2.5 release 2013-05-03 17:54:04 +02:00
Jonathan Ellis f9825d48a7 add description to stress-build 2013-05-02 19:08:31 -05:00
Dave Brosius bcd80487a4 Merge branch 'cassandra-1.2' into trunk 2013-05-02 10:24:19 -04:00
Dave Brosius 2ef11b4b6d Merge branch 'cassandra-1.1' into cassandra-1.2 2013-05-02 10:23:08 -04:00
Dave Brosius b4b4f6a95c explicitly set java source and target to 1.6 for the ant tasks 2013-05-02 10:18:03 -04:00
Dave Brosius d5754ab223 Merge branch 'cassandra-1.0' into cassandra-1.1 2013-05-02 10:12:19 -04:00
Dave Brosius f8567d15fe explicitly set java source and target to 1.6 for the ant tasks 
patch by dbrosius reviewed by slebresne for CASSANDRA-5533
 2013-05-02 10:08:44 -04:00
Dave Brosius 2bc79a0747 fix mvn-install target 
patch by stunnicliffe reviewed by dbrosius for CASSANDRA-5532
 2013-05-01 23:48:12 -04:00
Dave Brosius 851fe64006 Merge branch 'cassandra-1.2' into trunk 2013-04-30 01:01:55 -04:00
Dave Brosius 4f5c84742a Merge branch 'cassandra-1.1' into cassandra-1.2 2013-04-30 00:55:10 -04:00
Dave Brosius 50f49a6400 exclude *-sources.jar from the classpath 2013-04-30 00:54:04 -04:00
Jonathan Ellis 7746225dc5 Revert "Always record row-level tombstones in index component; this time from the correct feature branch" 
This reverts commits 811f82c5b1, 317ab72a8c, 344f5fa5af, d7a0982502.
 2013-04-22 09:38:11 -05:00
Jonathan Ellis d7a0982502 Always record row-level tombstones in index component; this time from the correct feature branch 
patch by jbellis; reviewed by jasobrown for CASSANDRA-5487
 2013-04-19 13:27:46 -05:00
Jonathan Ellis 17034c0878 Revert "Always record row-level tombstones in index component" 
This reverts commit 798470e051.
 2013-04-19 13:27:45 -05:00
Jonathan Ellis 798470e051 Always record row-level tombstones in index component 
patch by jbellis; reviewed by jasobrown for CASSANDRA-5487
 2013-04-19 13:20:46 -05:00
Eric Evans d939a0c958 updated for 1.1.11 release 2013-04-16 19:08:40 -05:00
Jonathan Ellis 0c7141ee8a remove PBSPredictor 
patch by jbellis; reviewed by marcuse for CASSANDRA-5455
 2013-04-11 11:29:41 -05:00
Sylvain Lebresne 2e96d07114 Change version for 1.2.4 release 2013-04-08 18:55:06 +02:00
Sylvain Lebresne a950b9257f Support indexes on composite column components 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-5125
 2013-04-04 18:10:35 +02:00
Dave Brosius b735555982 Merge branch 'cassandra-1.2' into trunk 2013-04-01 15:00:47 -04:00
Dave Brosius e06875ed2c add netty.jar as a dependency for all-pom 
patch by sbridges reviewed by dbrosius
 2013-04-01 14:53:24 -04:00
Jonathan Ellis b4b565af1d Merge branch 'cassandra-1.2' into trunk 2013-03-22 23:06:31 -05:00
Jonathan Ellis 54cc503961 add description to realclean 2013-03-22 23:06:22 -05:00
Pavel Yaskevich 86c3afb6d7 merge from 1.2 2013-03-20 14:41:30 -07:00
Pavel Yaskevich 3f88b27b4c Fix Guava dependency version (12.0 -> 13.0.1) for Maven 
patch by Pavel Yaskevich; reviewed by Sylvain Lebresne for CASSANDRA-5364
 2013-03-20 14:34:09 -07:00
Yuki Morishita b06c45a96d Merge branch 'cassandra-1.2' into trunk 2013-03-14 16:01:06 -05:00
Sylvain Lebresne f07804e0d0 Update versions and license for 1.2.3 2013-03-14 10:19:05 +01:00
Brandon Williams 47ba98ba11 upgrade metrics-core to 2.2.0 2013-03-06 16:45:44 -06:00
Sylvain Lebresne 306a565a4e Merge branch 'cassandra-1.2' into trunk 2013-03-04 18:26:44 +01:00
Sylvain Lebresne 3c6f87eed3 Add netty to pom dependencies 
patch by slebresne; reviewed by dbrosius for CASSANDRA-5181
 2013-03-04 18:25:45 +01:00
Jonathan Ellis 278a5e8600 trying again to commit #4872 via git apply 2013-02-18 09:24:23 -06:00
Jonathan Ellis 5bd57cbbbf Revert "Move sstable level information into the Stats component" 
This reverts commit 0e28478729.
 2013-02-18 09:22:50 -06:00
Jonathan Ellis 0e28478729 Move sstable level information into the Stats component 
patch by Marcus Eriksson; reviewed by jbellis for CASSANDRA-4872
 2013-02-18 08:46:15 -06:00
Aleksey Yeschenko 36f632c9eb Merge branch 'cassandra-1.2' into trunk 2013-02-15 01:27:36 +03:00