Commit Graph

8252 Commits

Author SHA1 Message Date
Vijay Parthasarathy e90dcd51d0 Make Ec2Region's datacenter name configurable
patch by Jason Brown; reviewed by Vijay for CASSANDRA-5155
2013-01-14 20:57:25 -08:00
Jonathan Ellis fc0f2472d8 move flushWriter into Memtable now that there's only one such service (used to have different executors for memtables/binarymemtables) 2013-01-14 16:29:09 -06:00
Jonathan Ellis 1fac06a848 drain should flush system CFs too
patch by jbellis; reviewed by yukim for CASSANDRA-4446
2013-01-14 15:34:52 -06:00
Brandon Williams ec21288db7 add setcompactionthreshold back to nodetool help 2013-01-14 09:45:00 -06:00
Brandon Williams 9c320d7512 Merge branch 'cassandra-1.1' into cassandra-1.2 2013-01-14 08:17:04 -06:00
Brandon Williams 4ff5b0ff22 more fixes 2013-01-14 08:16:55 -06:00
Brandon Williams 5e57ad3dc8 Merge branch 'cassandra-1.1' into cassandra-1.2 2013-01-14 07:39:49 -06:00
Brandon Williams 7de6f9666b fix tests after 5135 2013-01-14 07:39:33 -06:00
Brandon Williams 3a81af1900 Merge branch 'cassandra-1.1' into cassandra-1.2 2013-01-14 06:37:30 -06:00
Brandon Williams 713bba5af0 Calculate pending ranges asynchronously.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-5135
2013-01-14 06:26:22 -06:00
Jonathan Ellis 374524b5b3 improve CL logging 2013-01-11 17:45:01 -06:00
Jonathan Ellis 5262098a0b bump logging of IntervalNode creation down to trace 2013-01-11 17:44:03 -06:00
Jonathan Ellis 6487bc50bb add inter_dc_tcp_nodelay option
patch by Marcus Eriksson; reviewed by jbellis for CASSANDRA-5148
2013-01-11 16:12:25 -06:00
Yuki Morishita 8d9510ae40 Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
2013-01-11 12:56:24 -06:00
Yuki Morishita 3cc8656f8f better handling for amid compaction failure; patch by yukim reviewed by slebresne for CASSANDRA-5137 2013-01-11 12:32:59 -06:00
Yuki Morishita 18a1a4b93e Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
	src/java/org/apache/cassandra/thrift/CassandraServer.java
2013-01-11 11:03:13 -06:00
Yuki Morishita 1cbbba095a fix get_count returns incorrect value with TTL; patch by yukim reviewed by slebresne for CASSANDRA-5099 2013-01-11 11:01:42 -06:00
Sylvain Lebresne 189131631b Fix inserting empty maps
patch by slebresne; reviewed by jbellis for CASSANDRA-5141
2013-01-11 17:59:40 +01:00
Aleksey Yeschenko b664c55c37 Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
2013-01-11 19:41:28 +03:00
Aleksey Yeschenko 3bb84e9e2a Fix CQL3 BATCH authorization caching
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for CASSANDRA-5145
2013-01-11 19:36:44 +03:00
Aleksey Yeschenko 4c25eef0d7 Validate login for describe_keyspace, describe_keyspaces and
set_keyspace

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5144
2013-01-11 02:57:06 +03:00
Jonathan Ellis a1b601e435 merge from 1.1 2013-01-10 12:52:01 -06:00
Jonathan Ellis ccdb632d40 re-allow wrapping ranges for start_token/end_token range pairing
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5106
2013-01-10 12:50:41 -06:00
Yuki Morishita 1b41d6feab Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
	CHANGES.txt
2013-01-10 11:49:44 -06:00
Yuki Morishita f481a39167 Fix user defined compaction; patch by yukim reviewed by jbellis for CASSANDRA-5118 2013-01-10 11:26:41 -06:00
Jonathan Ellis 94f0b8568d merge from 1.1 2013-01-09 16:44:19 -06:00
Jonathan Ellis 0d2410e78a cleanup 2013-01-09 16:41:31 -06:00
Jonathan Ellis 1c2a69c358 fix validation compaction of empty rows
patch by Carl Yeksigian; reviewed by jbellis for CASSANDRA-5136
2013-01-09 15:58:19 -06:00
Sylvain Lebresne 3ff0c81f66 Add link to cql3 reference in news file 2013-01-09 18:48:44 +01:00
Brandon Williams 9ccaaadec6 Add jmx/nodetool methods to enable/disable hint storage/delivery
Patch by Alexey Zotov and brandonwilliams, reviewed by Alexey Zotov for
CASSANDRA-4750
2013-01-09 11:43:15 -06:00
Sylvain Lebresne b36a8081c0 Fix CQL3 doc 2013-01-09 17:02:34 +01:00
Sylvain Lebresne bdcf2cf44a Pick the correct value validator in sstable2json for CQL3
patch by slebresne; reviewed by driftx for CASSANDRA-5134
2013-01-09 13:52:28 +01:00
Sylvain Lebresne cc0c9f35b1 Fix unfriendly error message (CASSANDRA-5132) 2013-01-09 12:06:14 +01:00
Sylvain Lebresne b9ded64567 Merge branch 'cassandra-1.2' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2
Conflicts:
	CHANGES.txt
2013-01-09 11:18:54 +01:00
Sylvain Lebresne dc94f3730f Refuse unrecognized replication strategy options
patch by dbrosius; reviewed by slebresne for CASSANDRA-4795
2013-01-09 11:17:37 +01:00
Brandon Williams 794623441f Update NEWS 2013-01-08 20:09:40 -06:00
Aaron Morton 6108a34bba Ensure Jackson dependency matches lib
Patch by Nat McCall, reviewed by Aaron Morton for Cassandra-5126
2013-01-09 14:00:54 +13:00
Jonathan Ellis 5c8f0994f9 update CHANGES retroactively 2013-01-08 15:42:22 -06:00
Yuki Morishita a96a8d41e3 Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
	src/java/org/apache/cassandra/service/StorageService.java
	src/java/org/apache/cassandra/service/StorageServiceMBean.java
	src/java/org/apache/cassandra/tools/NodeCmd.java
	src/java/org/apache/cassandra/tools/NodeProbe.java
2013-01-08 14:28:23 -06:00
Brandon Williams 945853076c Handle states for non-vnode clusters correctly.
Patch by brandonwilliams reviewed by slebresne for CASSANDRA-5127
2013-01-08 13:25:13 -06:00
Yuki Morishita 0906b7cc51 Show progress on nodetool repair command; patch by yukim reviewed Sylvain Lebresne for CASSANDRA-4767 2013-01-08 11:20:25 -06:00
Sylvain Lebresne 8349fcebfb Fix exception when adding collection to table
patch by slebresne; reviewed by dbrosius for CASSANDRA-5117
2013-01-08 09:48:21 +01:00
Vijay Parthasarathy 4460e2865d Add support for SSL sockets to use client certificate authentication.
patch by Steven Franklin and Vijay for CASSANDRA-5120
2013-01-07 15:58:31 -08:00
Jonathan Ellis 55f936f1da Simplify CompressedRandomAccessReader to work around JDK FD bug
patch by jbellis; reviewed by Aleksey Yeschenko and tested by Cathy Daw for CASSANDRA-5088
2013-01-07 16:46:06 -06:00
Sylvain Lebresne 0d6131c400 Validat correctly selects on composite partition key
patch by slebresne; reviewed by jbellis for CASSANDRA-5122
2013-01-07 17:22:49 +01:00
Jonathan Ellis dac6048c50 disallow bloom filter false positive chance of 0
patch by jbellis and brandonwilliams for CASSANDRA-5013
2013-01-07 09:36:41 -06:00
Sylvain Lebresne 3d787b78c1 Ensure CL guarantees on digest mismatch
patch by slebresne; reviewed by jbellis for CASSANDRA-5113
2013-01-07 11:11:45 +01:00
Brandon Williams af8a477ccc Merge branch 'cassandra-1.1' into cassandra-1.2 2013-01-04 12:14:18 -06:00
Brandon Williams bf1ed4089c Update news for 4880 2013-01-04 12:13:49 -06:00
Brandon Williams 9852a9360c Correctly gossip with nodes >= 1.1.7
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-5102
2013-01-04 12:10:30 -06:00