Commit Graph

823 Commits

Author SHA1 Message Date
Robert Stupp 9a2fd8ccf3 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-27 15:26:02 +01:00
Robert Stupp 0ee8895b27 Show CQL help in cqlsh in web browser
patch by Robert Stupp; reviewed by Paulo Motta for CASSANDRA-7225
2015-11-27 15:24:51 +01:00
Robert Stupp 6ac831f327 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-20 17:24:42 +01:00
Robert Stupp 49d9e51555 Reevaluate inspections in generate-idea-files target
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9844
2015-11-20 17:24:03 +01:00
Sylvain Lebresne 0c04a6bc5b Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-20 13:15:38 +01:00
Sylvain Lebresne 3851670d78 Backport test parallelization build tasks
patch by rhatch; reviewed by aweisberg for CASSANDRA-10703
2015-11-20 13:13:54 +01:00
Sylvain Lebresne d1ad7961ed Remove cobertura from build file
patch by rhatch; reviewed by aweisberg for CASSANDRA-10704
2015-11-20 13:08:37 +01:00
T Jake Luciani 96f407bce5 3.0 release versions 2015-11-06 14:38:34 -05:00
Aleksey Yeschenko 340df43fb7 Use CQL type names in schema metadata tables
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10365
2015-11-04 17:06:07 +00:00
T Jake Luciani 56a06d78f2 bump versions 2015-10-16 16:03:16 -04:00
Aleksey Yeschenko 56cfc6ea35 Remove Pig support
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10542
2015-10-16 13:23:20 +01:00
T Jake Luciani 8444302432 bump versions for 2.2.3 2015-10-12 09:50:39 -04:00
Branimir Lambov e77730179c Clean resource usage warnings.
Patch by Branimir Lambov; reviewed by tjake for CASSANDRA-10385
2015-10-07 13:20:18 -04:00
Tyler Hobbs 5c2912d1ce Flush system schema tables after local schema changes
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-10429
2015-10-01 14:25:54 -05:00
T Jake Luciani ae9b7e0522 bump verion 2015-10-01 09:38:36 -04:00
T Jake Luciani c95a7098cf bump release 2015-09-19 16:03:29 -04:00
blerer 0d4e0cd226 Merge branch cassandra-2.2 into cassandra-3.0 2015-09-16 10:34:00 +02:00
blerer e7c2952d31 Merge branch cassandra-2.1 into cassandra-2.2 2015-09-16 10:21:58 +02:00
blerer b8b4eb76c4 Add Benjamin Lerer to the developer list in build.xml 2015-09-16 10:18:18 +02:00
Michael Shuler f961e84aa6 Set test.timeout back to 60 seconds
Patch by Michael Schuler; reviewed by Tyler Hobbs for CASSANDRA-10284
2015-09-08 12:54:25 -05:00
T Jake Luciani 17528910b8 bump versions 2015-09-04 19:11:39 -04: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
T Jake Luciani 3238906477 bump versions 2015-08-25 13:24:57 -04:00
T Jake Luciani 7d74563a25 bump versions 2015-08-25 09:39:15 -04:00
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