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

15066 Commits

Author SHA1 Message Date
Jason Brown c2142e6549 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2015-07-22 06:01:14 -07:00
Jason Brown 704ca66f99 changes.txt 2015-07-22 05:57:58 -07:00
Jason Brown 046ff1e5d3 checkForEndpointCollision fails for legitimate collisions 
patch by stefania; reviewed by jasobrown for CASSANDRA-9765
 2015-07-22 05:57:17 -07:00
Sylvain Lebresne 172a9754d6 Fix MarshalException when upgrading super column families 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-9582
 2015-07-22 09:54:49 +02:00
Paulo Motta b70f7ea0ce Remove repair snapshot leftover on startup 
patch by Paulo Motta; reviewed by yukim for CASSANDRA-7357
 2015-07-21 22:11:37 -05:00
Jeremiah D Jordan e726cf6d6b Expose SelectStatement.Parameters fields for QueryHandler implementors 
patch by Jeremiah D Jordan; reviewed by Aleksey Yeschenko for
CASSANDRA-9858
 2015-07-21 21:54:50 +03:00
Benedict Elliott Smith b87103befe ninja fix heap usage ratio logging 2015-07-20 12:52:17 +01:00
Sylvain Lebresne 2d462c0497 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2015-07-17 15:36:24 +02:00
Sylvain Lebresne 0ef1888690 Move CASSANDRA-9519 test in long tests (and reduce the size of the list used) 2015-07-17 15:35:24 +02:00
Sylvain Lebresne a9b9e627b0 Fix comparison contract violation in the dynamic snitch sorting 
patch by slebresne; reviewed by benedict for CASSANDRA-9519

Conflicts:
	CHANGES.txt
 2015-07-17 15:35:07 +02:00
Michael McKibben 1eda7cb55c Fix broken logging for "empty" flushes in Memtable 
patch by Michael McKibben; reviewed by Robert Stupp for CASSANDRA-9837
 2015-07-17 08:36:12 +02:00
Sylvain Lebresne 4fcd7d4d36 Move CASSANDRA-9519 test in long tests (and reduce the size of the list used) 2015-07-16 15:21:26 +02:00
Stefania Alborghetti 9ff5d44c42 Fix error message in ReadResponse 
patch by Stefania Alborghetti; review by Benjamin Lerer for CASSANDRA-9460
 2015-07-16 14:25:11 +02:00
Stefania Alborghetti ba9a69ea21 checkForEndpointCollision fails for legitimate collisions, finalized list of statuses and nits, CASSANDRA-9765 2015-07-16 10:04:58 +08:00
Sam Tunnicliffe dc79a86531 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2015-07-15 16:25:54 +01:00
Sam Tunnicliffe 1d54fc3397 Don't include auth credentials in debug log 
Patch by Sam Tunnicliffe; reviewed by Brandon Williams for
CASSANDRA-9682
 2015-07-15 15:29:25 +01:00
blerer 07103ddb72 Add missing tests for CASSANDRA-9460 
patch by Stefania Alborghetti; review by Benjamin Lerer for
 CASSANDRA-9460
 2015-07-15 16:22:56 +02:00
Stefania Alborghetti b16d8c9caa Fix NullPointerException creating digest 
patch by Stefania Alborghetti; review by Benjamin Lerer for CASSANDRA-9460
 2015-07-15 11:59:23 +02:00
Stefania Alborghetti 54470a25f3 checkForEndpointCollision fails for legitimate collisions, improved version after CR, CASSANDRA-9765 2015-07-15 16:30:22 +08:00
Sylvain Lebresne 9d44186ee3 Fix comparison contract violation in the dynamic snitch sorting 
patch by slebresne; reviewed by benedict for CASSANDRA-9519
 2015-07-15 10:10:45 +02:00
Stefania Alborghetti 1ecccede7d Handle corrupt files on startup 
Patch by stefania; reviewed by marcuse for CASSANDRA-9686
 2015-07-13 19:03:37 +02:00
Stefania Alborghetti 2c9b490c97 checkForEndpointCollision fails for legitimate collisions, CASSANDRA-9765 2015-07-10 14:22:32 +08:00
Stefania Alborghetti 19c00f7212 Backport CASSANDRA-9601 to 2.1 
Patch by Stefania Alborghetti; reviewed by Benjamin Lerer; backported by
Tyler Hobbs for CASSANDRA-9601
 2015-07-09 12:29:53 -05:00
Jason Brown c4b52603fb Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2015-07-08 14:13:12 -07:00
Jason Brown 52dbc3f1ba Can't transition from write survey to normal mode 
patch by jasobrown; reviewed by driftx for CASSANDRA-9740
 2015-07-08 14:11:12 -07:00
Stefania Alborghetti 89d81345fd Renamed InsertUpdateIfCondition to InsertUpdateIfConditionTest, CASSANDRA-9733 2015-07-08 21:54:00 +02: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
Yuki Morishita fe7a7a7f9f Merge branch 'cassandra-2.0' into cassandra-2.1 2015-07-08 12:21:08 -05:00
Yuki Morishita 7cebd0eeca Fixed issues have wrong version 2015-07-08 12:20:39 -05:00
Yuki Morishita 58599a9a07 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-07-08 12:06:51 -05:00
Yuki Morishita f283ed2981 Fix growing pending background compaction 
patch by yukim; reviewed by benedict for CASSANDRA-9662
 2015-07-08 11:58:17 -05:00
Jesse Szwedko 30df089d72 cqlsh: Make SSL protocol version configurable 
Patch by Jesse Szwedko; reviewed by Tyler Hobbs for CASSANDRA-9544
 2015-07-07 15:47:57 -05:00
Benedict Elliott Smith 4c94ef20d3 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/compaction/Scrubber.java
	src/java/org/apache/cassandra/io/sstable/SSTableReader.java
 2015-07-07 16:27:58 +01:00
T Jake Luciani 4de943fd9c remove extra ant dep from build 2015-07-07 10:46:13 -04:00
Stefania Alborghetti 452d6a445a Scrub (recover) sstables even when -Index.db is missing 
patch by mck; reviewed by stefania for CASSANDRA-9591
 2015-07-07 14:27:25 +01: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
T Jake Luciani eb875b4af6 bump versions 2015-07-06 11:19:42 -04:00
Sam Tunnicliffe ca2f022367 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2015-07-06 15:06:50 +01:00
Sam Tunnicliffe 62714a9fed Conditionally read token in AuthSuccess#decode 
Patch by Pierre Nogues; reviewed by Sam Tunnicliffe for CASSANDRA-9727
 2015-07-06 14:53:27 +01:00
Benedict Elliott Smith aa8a7b5576 fixup SSTableRewriterTest 2015-07-06 12:49:48 +01:00
Benedict Elliott Smith ec320e8a1d Follow-up to CASSANDRA-9656, fixing: 
* DataTracker.getCurrentVersion
  * keyCache wiring
  * offline totalDiskSpaceUsed maintenance, affecting unit tests
 2015-07-06 12:12:54 +01:00
Jonathan Ellis ca40d11c72 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-07-02 13:07:41 -07:00
Carl Yeksigian 3623ea437e Adding listen_address to system.local (CASSANDRA-9603) 2015-07-02 13:05:09 -07:00
Stefania Alborghetti 921eb7e806 Warn when an extra-large partition is compacted, CASSANDRA-9643 2015-07-02 11:37:50 -07:00
Benedict Elliott Smith 2595e74f68 Eliminate strong self-reference chains in sstable ref tidiers 
patch by benedict; reviewed by branimir for CASSANDRA-9656
 2015-07-02 19:07:27 +01:00
Benedict Elliott Smith 98ac45a8a4 Ensure StreamSession uses canonical sstable instances 
patch by benedict; reviewed by yukim for CASSANDRA-9700
 2015-07-02 18:05:09 +01:00
Sam Tunnicliffe 7473877eea Merge branch 'cassandra-2.0' into cassandra-2.1 2015-07-02 11:25:28 +01:00
Sam Tunnicliffe 2a294e45aa Bug fixes to SelectionColumnMapping 
Patch and review by Benjamin Lerer and Sam Tunnicliffe for
CASSANDRA-9636
 2015-07-02 11:18:21 +01:00
Benedict Elliott Smith b757db1484 Ensure memtable book keeping is not corrupted in the event we shrink usage 
patch by benedict; reviewed by tjake for CASSANDRA-9681
 2015-07-02 10:27:07 +01:00
Mike Adamson c5f03a9883 cqlsh: fix DESCRIBE KEYSPACES 
Patch by Mike Adamson; reviewed by Tyler Hobbs for CASSANDRA-9693
 2015-07-01 17:12:11 -05:00