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

1049 Commits

Author SHA1 Message Date
T Jake Luciani 5f6da8f959 bump versions 2015-08-21 22:36:48 -04:00
Sam Tunnicliffe 43b18d1802 Re-enable brief output for junit logs from CASSANDRA-9528 2015-08-19 18:11:51 +01: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
Robert Stupp 6445dd62bb Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-14 17:24:31 +02:00
Peter Palaga 1ba949af40 Unable to start Thrift RPC server in cassandra deployment created using cassandra-all 
patch by Peter Palaga; reviewed by Robert Stupp for CASSANDRA-10071
 2015-08-14 17:23:22 +02:00
Yuki Morishita df3b6027bc ScrubTest should generate out-of-order SSTable on the fly 
with some other ScrubTest fixes.

patch by yukim; reviewed by Stefania Alborghetti for CASSANDRA-9880
 2015-07-30 10:09:07 -05:00
T Jake Luciani 17bcb6d085 bump versions for alpha1 2015-07-30 09:31:17 -04:00
T Jake Luciani f0be8904df Revert "Revert "Fix build, bump version"" 
This reverts commit ce3d9af331.
 2015-07-29 18:29:45 -04:00
Jonathan Ellis ce3d9af331 Revert "Fix build, bump version" 
This reverts commit b93f05d7d1.
 2015-07-29 17:03:46 -05:00
T Jake Luciani b93f05d7d1 Fix build, bump version 2015-07-29 16:53:43 -04:00
Aleksey Yeschenko fb10df212e Merge branch 'cassandra-2.2' into trunk 2015-07-28 18:10:58 +03:00
Ariel Weisberg ae179e4532 Get entropy from /dev/urandom for unit tests 
patch by Ariel Weisberg; reviewed by Aleksey Yeschenko for
CASSANDRA-9581
 2015-07-28 18:03:46 +03:00
Stefania Alborghetti b09e60f72b Introduce safer durable sstable membership management 
(and simplify cleanup of compaction leftovers)

Instead of using temporary files and system tables,
this patch introduces a simple transaction log for sstable
membership edits that can be committed/aborted atomically
and simply replayed on startup.

patch by stefania; reviewed by benedict for CASSANDRA-7066
 2015-07-24 14:41:51 +01:00
Robert Stupp ece5cfc66d Merge branch 'cassandra-2.2' into trunk 2015-07-21 22:38:42 +02:00
Robert Stupp 4601abb911 Cache maven-ant-tasks.jar locally 
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-9757
 2015-07-21 22:38:12 +02:00
Robert Stupp a668638611 Merge branch 'cassandra-2.2' into trunk 2015-07-20 15:17:22 +02:00
Robert Stupp a65953d595 Fix build.xml to not download non-existent source jars, cleanup duplicate artifacts 
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-9845
 2015-07-20 15:16:07 +02:00
Ariel Weisberg 074452efab fix broken classpath for eclipse warnings 
patch by Ariel Weisberg; reviewed by tjake for CASSANDRA-9803
 2015-07-20 08:25:47 -04:00
T Jake Luciani b10a51a423 bump versions for 2.2.0 2015-07-17 13:08:37 -04: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
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
T Jake Luciani 2ae4163980 Merge branch 'cassandra-2.2' into trunk 
Conflicts:
	CHANGES.txt
 2015-07-08 15:19:45 -04:00
T Jake Luciani 882cf25841 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/utils/FBUtilities.java
 2015-07-08 15:15:58 -04:00
T Jake Luciani 08f4f5a674 Fix clientutil-jar and tests 
patch by tjake; reviewed by Jason Brown for (CASSANDRA-9760)
 2015-07-08 14:28:19 -04:00
Robert Stupp 5eed96789a ninja-add Sam to developers 2015-07-08 18:54:20 +07:00
T Jake Luciani db68d1cfd6 Merge branch 'cassandra-2.2' into trunk 2015-07-07 10:48:42 -04:00
T Jake Luciani 7d31068da9 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	build.xml
 2015-07-07 10:47:36 -04:00
T Jake Luciani 4de943fd9c remove extra ant dep from build 2015-07-07 10:46:13 -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 eb875b4af6 bump versions 2015-07-06 11:19:42 -04:00
Sam Tunnicliffe dcfd6f308e Merge branch 'cassandra-2.2' into trunk 2015-07-02 11:33:55 +01: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 3796e8fa3e bump versions 2015-06-30 09:53:25 -04:00
Sylvain Lebresne a991b64811 Storage engine refactor, a.k.a CASSANDRA-8099 
Initial patch, see ticket for details
 2015-06-30 12:47:01 +02:00
T Jake Luciani e211008d5a Merge branch 'cassandra-2.2' into trunk 2015-06-29 09:53:46 -04:00
T Jake Luciani bafcb3a568 fix idea files issue 2015-06-29 09:52:57 -04:00
Benedict Elliott Smith bd4a9d18e1 backport burn test refactor 2015-06-28 11:38:22 +01:00
Sam Tunnicliffe 00a34c791e Merge branch 'cassandra-2.2' into trunk 2015-06-26 12:42:20 +01:00
Sam Tunnicliffe 3200d6ce66 Fix generate-eclipse-files ant target 2015-06-26 12:42:01 +01:00
T Jake Luciani 9a71238706 Merge branch 'cassandra-2.2' into trunk 2015-06-25 14:35:10 -04:00
Andrew Tolbert 26bd5124ef Optimize stress driver config for 2.2 
Patch by Andrew Tolbert; reviewed by tjake for CASSANDRA-9558
 2015-06-25 14:28:31 -04:00
Ariel Weisberg c8d3cc1493 Improve log output from unit tests 
patch by Ariel Weisberg; reviewed by Robert Stupp for CASSANDRA-9528
 2015-06-24 08:09:52 +02:00
Yuki Morishita e246ec258c Merge branch 'cassandra-2.2' into trunk 2015-06-18 19:26:43 -05:00
Ariel Weisberg 947edf1f19 Remove usage of suitename that is causing some tasks to silently fail in cassci 
Follow up on CASSANDRA-9583
 2015-06-18 19:26:16 -05:00
Yuki Morishita e14ce11c02 Merge branch 'cassandra-2.2' into trunk 2015-06-18 14:12:15 -05:00
Ariel Weisberg 55a736acff Update and refactor ant test/test-compression to run the tests in parallel 
patch by Ariel Weisberg; reviewed by yukim for CASSANDRA-9583
 2015-06-18 14:10:37 -05:00
T Jake Luciani 718c144324 bump versions 2015-06-18 14:53:07 -04:00
T Jake Luciani b0ae285bdc bump versions 2015-06-05 11:13:54 -04:00
T Jake Luciani e469f32be1 bump versions 2015-06-05 10:47:35 -04:00
Robert Stupp 78c03052c5 Merge branch 'cassandra-2.2' into trunk 2015-06-04 11:17:42 +02: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
Jason Brown ad58bf7c73 Merge branch 'cassandra-2.2' into trunk 2015-05-29 10:11:09 -07:00
Jason Brown 1352ebd61d ant test-all results incomplete when parsed (part 2) 
patch by aweisberg; reviewed by jasobrown for CASSANDRA-9463
 2015-05-29 10:07:59 -07:00
T Jake Luciani d91eb01169 Merge branch 'cassandra-2.2' into trunk 
Conflicts:
	build.xml
 2015-05-27 17:56:48 -04:00
T Jake Luciani 7aafe053e7 Add Static Analysis to warn on unsafe use of Autocloseable instances 
Patch by tjake and carlyeks, reviewed by benedict for CASSANDRA-9431
 2015-05-27 17:53:26 -04:00
Jason Brown 162489aed5 test-all results incomplete when parsed 
patch by aweisberg; reviewed by jasobrown for CASSANDRA-9463
 2015-05-27 08:39:32 -07:00
Jason Brown 352302f5a7 test-all results incomplete when parsed 
patch by aweisberg; reviewed by jasobrown for CASSANDRA-9463
 2015-05-26 15:29:01 -07:00
Tyler Hobbs 3123e88e54 Merge branch 'cassandra-2.2' into trunk 2015-05-26 14:23:21 -05:00
Ariel Weisberg 91187b542e Allow skipping file syncs during tests 
Patch by Ariel Weisberg; reviewed by Tyler Hobbs for CASSANDRA-9403
 2015-05-26 14:21:18 -05:00
Dave Brosius a2830ef993 Merge branch 'cassandra-2.2' into trunk 2015-05-22 18:48:37 -04:00
Dave Brosius bb1f131047 exclude maven dependency (thru hadoop-core) of core-3.1.1 as it is provided now by ecj 
patch by dbrosius reviewed by bwilliams for cassandra-9410
 2015-05-22 18:47:58 -04:00
Dave Brosius 7c673393de add ecj to cassandra-all's pom 2015-05-17 19:03:42 -04:00
Robert Stupp f58a44763a Generate IDEA project files for Java8 2015-05-15 21:24:51 +02:00
T Jake Luciani ccebac598f Require java 8: CASSANDRA-8168 2015-05-15 12:52:19 -04:00
T Jake Luciani 94480b1f4f beta1 version 2015-05-15 12:49:46 -04: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
Sam Tunnicliffe 79e1e80627 Swap all references to 3.0 with 2.2 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-9352
 2015-05-14 17:16:54 +03: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
Benedict Elliott Smith aa811c3936 Introduce test-burn ant target 
patch by ariel for CASSANDRA-9307
 2015-05-06 17:24:56 +01: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
T Jake Luciani 9a0b3956f1 bump version 2015-04-29 14:22:53 -04:00
Sam Tunnicliffe 194bad22f7 Add pre-startup checks to detect potential incompatibilities 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-8049
 2015-04-28 15:18:36 +03: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
Brandon Williams 4a3ca5c70e Allow Cassandra config to be updated to restart Daemon without unloading classes 
Patch by Emmanuel Hugonnet, reviewed by aweisberg for CASSANDRA-9046
 2015-04-13 13:34: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
Robert Stupp 4fd6c969d0 Merge branch 'cassandra-2.1' into trunk 2015-04-07 18:17:22 +02:00
Robert Stupp 2641424247 Add generate-idea-files target to build.xml 
Patch by Robert Stupp; Reviewed by T Jake Luciani for CASSANDRA-9123
 2015-04-07 18:12:16 +02: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 c041ea8b37 Bind JMX to localhost unless explicitly configured otherwise 2015-03-30 09:38:50 -04:00
Dave Brosius d772f6f84e fix artifact name or reporter-config3 2015-03-28 11:30:57 -04:00
blambov 44f8254df8 Compressed Commit Log 
patch by branimir; reviewed by ariel for CASSANDRA-6809
 2015-03-24 23:42:30 +00: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
Dave Brosius da8268f156 Suppress warning: 'DirectBuffer is internal proprietary API and may be removed in a future release' 2015-03-17 23:15:22 -04:00
Brandon Williams db1cf3e084 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2015-03-17 14:34:59 -05:00
Brandon Williams 77d58f900e Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2015-03-17 14:34:26 -05:00
Brandon Williams b2aa67ea29 Allow specifying the tmp dir 
Patch by mshuler, reviewed by brandonwilliams for CASSANDRA-7712
 2015-03-17 14:33:27 -05:00
Dave Brosius d182fa1b41 make joda-time a proper pom dependency of cassandra 2015-03-16 23:02:35 -04:00
T Jake Luciani 31a182876e bump versions 2015-03-16 11:48:11 -04: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
Brandon Williams 847f413ead Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
 2015-02-26 09:50:58 -08:00
Brandon Williams 322e8f0595 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-02-26 09:48:50 -08:00
Brandon Williams 98502e0c3f add comment about using testsome target 2015-02-26 09:48:40 -08:00
T Jake Luciani 9fdbb6559d fix bad merge 2015-02-20 12:38:28 -05:00
T Jake Luciani ea3ff25a0c Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
 2015-02-20 11:37:55 -05:00
T Jake Luciani 407b5de67c Upgrade java-driver used by cassandra-stress 
patch by tjake; reviewed by benedict for CASSANDRA-8842
 2015-02-20 11:32:59 -05:00
Benedict Elliott Smith 3e43ea46e8 fix merges 2015-02-19 14:29:14 +00:00
Benedict Elliott Smith dfd695c14b Select optimal CRC32 implementation at runtime 
patch by ariel; reviewed by benedict for CASSANDRA-8614
 2015-02-19 12:24:59 +00:00
T Jake Luciani caba0a5920 docs and bump version 2015-02-05 11:11:14 -05: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
Benedict Elliott Smith 9c4a776d20 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java
	src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
	src/java/org/apache/cassandra/service/ActiveRepairService.java
	src/java/org/apache/cassandra/streaming/StreamSession.java
	src/java/org/apache/cassandra/streaming/StreamTransferTask.java
	src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
	test/unit/org/apache/cassandra/SchemaLoader.java
	test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
	test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
	test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
 2015-01-28 15:19:58 +00:00
Benedict Elliott Smith c75ee4160c Safer Resource Management 
patch by benedict; review by marcuse for CASSANDRA-7705
 2015-01-28 14:46:16 +00:00
Dave Brosius 7fb99d93ff trunk is using 1.0.5.2 of snappy-java 2015-01-27 02:05:04 -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 35783b9567 add Robert as developer 2015-01-21 22:26:54 -05:00
Dave Brosius 222ea95835 minor javadoc fixes 2015-01-21 21:40:21 -05: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
T Jake Luciani 5b66997fa8 prep for 2.0.12 release 2015-01-09 15:21:49 -05:00
Yuki Morishita 395720c37a fix to run test 2014-11-24 18:57:50 -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
Robert Stupp b4d7f3bed0 Deal with conflicts between system functions and UDFs 
patch by Robert Stupp; reviewed by Benjamin Lerer for CASSANDRA-7813
 2014-11-14 18:20:29 +03:00
Dave Brosius c832a36f25 route sigar's use of log4j thru slf4j 2014-11-08 23:12:04 -05:00
Mikhail Stepura 203efd0221 Merge branch 'cassandra-2.1' into trunk 2014-11-07 13:46:10 -08:00
Mikhail Stepura 155eccd66e (Eclipse) Re-use test classes from an ant build 
patch by Mikhail Stepura; reviewed by T Jake Luciani for CASSANDRA-8277
 2014-11-07 13:45:36 -08:00
Jake Luciani aa6233aa19 Fix build 2014-11-05 21:04:55 -05:00
Jake Luciani 44e9f23d4f Prep for 2.1.2 2014-11-05 15:56:15 -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
T Jake Luciani ee85a31f6f Merge branch 'cassandra-2.1' into trunk 2014-11-04 09:41:55 -05:00
Mikhail Stepura 0bc1ea385e Attach existing sources to "Referenced libraries" in Eclipse 
Patch by Mikhail Stepura; reviewed by tjake for CASSANDRA-8240
 2014-11-04 09:34:05 -05:00
Mikhail Stepura a6c58f8b2f Don't compile Thrift sources in Eclipse, use classes for an ant build 
patch by Mikhail Stepura; reviewed by tjake for CASSANDRA-8250
 2014-11-04 09:23:18 -05:00
Mikhail Stepura 02a20f70b0 Merge branch 'cassandra-2.1' into trunk 2014-11-03 14:46:20 -08:00
Mikhail Stepura a8072ae3be Add junitreport target. 
patch by Mikhail Stepura; reviewed by Brandon Williams and Michael Shuler for CASSANDRA-6482
 2014-11-03 14:45:46 -08:00
Jake Luciani 0368e97ee4 Extend Descriptor to include a format value and refactor reader/writer apis 
patch by tjake; reviewed by Marcus Eriksson for CASSANDRA-7443
 2014-10-23 11:10:55 -04:00
Sylvain Lebresne 02b83d9a8c Update versions for 2.0.11 2014-10-21 16:23:52 +02:00
T Jake Luciani c235603475 Integrate JMH into build system 
patch by tjake; reviewed by Jason Brown for CASSANDRA-8151
 2014-10-21 09:57:12 -04:00
Brandon Williams 3ef8920014 bump base version to 3.0 2014-10-14 15:19:37 -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
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
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
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
Sylvain Lebresne bc63083217 Merge branch 'cassandra-2.1' into trunk 2014-08-22 16:17:01 +02:00
Sylvain Lebresne 94f1107eca Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
 2014-08-22 16:16:46 +02:00
Sylvain Lebresne 8da134377a Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	build.xml
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
 2014-08-22 16:15:50 +02:00
Sylvain Lebresne 200b802884 Update java driver to 2.0.5 (for hadoop) 2014-08-22 16:11:44 +02:00
Sylvain Lebresne 9aea917b2c Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2014-08-18 10:23:20 +02:00
Sylvain Lebresne 5db108c314 Support list index operation with conditions 
patch by slebresne; reviewed by thobbs for CASSANDRA-7499
 2014-08-18 10:22:40 +02:00
Joshua McKenzie 048f72bd3e Merge branch 'cassandra-2.1' into trunk 2014-08-13 17:12:24 -05:00
Joshua McKenzie 74e7f28f7f fix generate-eclipse-files build.xml target on JDK 8 
Patch by Robert Stupp, reviewed by Josh McKenzie for CASSANDRA-7430
 2014-08-13 17:10:23 -05:00
Joshua McKenzie 696acc9239 Merge branch 'cassandra-2.1' into trunk 2014-08-12 16:40:38 -05:00
Joshua McKenzie 54215a21f0 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-12 16:40:15 -05:00
Joshua McKenzie dc8b4e1118 build.xml - exclude *.ps1 from fixcrlf 
Patch by Robert Stupp; review by Joshua McKenzie for CASSANDRA-7690
 2014-08-12 16:37:20 -05:00
Aleksey Yeschenko 5205ce669f Merge branch 'cassandra-2.1' into trunk 2014-08-11 01:08:53 +03:00
Aleksey Yeschenko f2f2d47324 Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
 2014-08-11 01:07:32 +03:00
Sylvain Lebresne 74847893c8 Versions for 2.1.0-rc6 2014-08-09 13:47:44 +02:00
Robert Stupp 25411bf1d1 Support pure user-defined functions 
Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7395
 2014-08-08 14:11:01 -05:00
Sylvain Lebresne 2f25e6e6ea Merge branch 'cassandra-2.1' into trunk 2014-08-08 12:51:12 +02:00
Sylvain Lebresne 8aed4196d2 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-08 12:50:44 +02:00
Sylvain Lebresne a932b62eae Include stress yaml examples in release and deb 
patch by tjake and mshuler; reviewed by mshuler and slebresne for CASSANDRA-7717
 2014-08-08 12:49:25 +02:00
Sylvain Lebresne cd37d07baf Version and licenses for 2.0.10 release 2014-08-08 10:54:41 +02:00
Aleksey Yeschenko 59123b6f7d Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
 2014-08-07 00:51:07 +03:00
Aleksey Yeschenko 6beb13f19c Synchronise build.xml developers list with ASF C* committers 
See https://people.apache.org/committers-by-project.html#cassandra and
https://wiki.apache.org/cassandra/Committers
 2014-08-07 00:48:23 +03:00
Benedict Elliott Smith efe57f2306 Merge branch 'cassandra-2.1' into trunk 2014-08-05 15:22:21 +01:00
Benedict Elliott Smith 6a8d978f39 ninja add benedict to committers 2014-08-05 15:22:11 +01:00
Sylvain Lebresne cc3bd8bc98 Merge branch 'cassandra-2.1' into trunk 2014-08-05 10:22:32 +02:00
Sylvain Lebresne e6602f7639 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-05 10:22:07 +02:00
Sylvain Lebresne 95d289b849 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
	build.xml
 2014-08-05 10:21:48 +02:00
Sylvain Lebresne 5151fd5bcc Update java driver to 2.0.4 (for hadoop) 
patch by alexliu68; reviewed by slebresne for CASSANDRA-7618
 2014-08-05 10:18:58 +02:00
Dave Brosius d6f3cdf6ff Merge branch 'cassandra-2.1' into trunk 2014-08-03 00:45:48 -04:00
Dave Brosius 8d06dd102d Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-03 00:39:59 -04:00
Sylvain Lebresne cfb335e39b Update versions for 2.1.0-rc5 release 2014-08-02 13:48:00 +02:00
Brandon Williams 1e2a5b0ee3 Pig support for hadoop CqlInputFormat 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6454
 2014-07-23 10:26:50 -05:00
Brandon Williams 2093270c7c Merge branch 'cassandra-2.1' into trunk 2014-07-21 07:51:21 -05:00
Brandon Williams 3b14f6a5db Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-07-21 07:51:10 -05:00
Eric Evans d872e2c746 update versioning for 2.1.0-rc4 release 2014-07-18 13:42:11 -05:00
Jonathan Ellis 5dfee585dd fix build on os x 2014-07-17 15:57:30 -05:00
Brandon Williams 15ced94287 Merge branch 'cassandra-2.1' into trunk 2014-07-09 11:58:27 -05:00
Brandon Williams 40fd7f0120 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-09 11:58:15 -05:00
Brandon Williams 0b8fb5bb92 fix missing test build dep for pig-test 2014-07-09 11:50:49 -05:00
Aleksey Yeschenko 111f0c0f91 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	debian/changelog
 2014-07-08 20:21:26 +03:00
Aleksey Yeschenko 04944f0ca9 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-08 20:18:24 +03:00
Sylvain Lebresne 0bc98414ce Update versions and licenses for 2.1 RC3 release 2014-07-08 14:07:17 +02:00
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