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

18062 Commits

Author SHA1 Message Date
Dave Brosius 65f8bb6c46 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	lib/licenses/crc32ex-0.1.1.txt
	lib/licenses/snappy-java-1.0.5.2.txt
	lib/licenses/snappy-java-1.0.5.txt
	lib/licenses/snappy-java-1.1.1.7.txt
	lib/licenses/thrift-server-0.3.5.txt
	lib/licenses/thrift-server-0.3.7.txt
 2016-07-01 16:10:55 -04:00
Dave Brosius da20fece74 update license txt file version numbers 2016-07-01 16:08:35 -04:00
Dave Brosius bd6ad43b9c update license file versions 2016-07-01 15:53:29 -04:00
Josh McKenzie 82cdc8617a Revert "Fix GC logging on first start" 
This reverts commit 3a61c10659.
 2016-06-30 16:31:43 -04:00
Josh McKenzie 8f5b8db589 Revert "Ninja: suppress printed output on dir creation in Win32 startup" 
This reverts commit 3041034fb9.
 2016-06-30 16:31:32 -04:00
Josh McKenzie 3041034fb9 Ninja: suppress printed output on dir creation in Win32 startup 2016-06-30 13:35:20 -04:00
Sylvain Lebresne fdee942ba6 Merge commit '40b18d5' into cassandra-2.2 
* commit '40b18d5':
  Fix changelog (2.1.15 is frozen)
 2016-06-30 17:10:41 +02:00
Sylvain Lebresne 40b18d5746 Fix changelog (2.1.15 is frozen) 2016-06-30 17:10:15 +02:00
Sylvain Lebresne f4288f4026 Merge commit 'fda3d8ee25adc4837bb5754f718062e522c04788' into cassandra-2.2 
* commit 'fda3d8ee25adc4837bb5754f718062e522c04788':
  Reduce contention getting instances of CompositeType
 2016-06-30 17:08:17 +02:00
Sylvain Lebresne fda3d8ee25 Reduce contention getting instances of CompositeType 
patch by schlosna; reviewed by slebresne for CASSANDRA-10433
 2016-06-30 17:06:24 +02:00
Marcus Eriksson f72927e8e5 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-06-30 13:15:24 +02:00
Marcus Eriksson 5a9820d4a4 Account for partition deletions in tombstone histogram 
Patch by marcuse; reviewed by Sylvain Lebresne for CASSANDRA-12112
 2016-06-30 13:12:03 +02:00
Rei Odaira 38ed061363 MemoryUtil.getShort() should return an unsigned short also for aligned platforms 
patch by Rei Odaira; reviewed by Stefania Alborghetti for CASSANDRA-11973
 2016-06-29 14:03:27 +08:00
T Jake Luciani ea8c430124 version 2.2.7 2016-06-28 20:10:15 -04:00
T Jake Luciani 4da04741e9 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-06-28 20:07:36 -04:00
T Jake Luciani cb14186f8d version 2.1.15 2016-06-28 20:06:55 -04:00
Mahdi Mohammadi 3a61c10659 Fix GC logging on first start 
Patch by mmohammadi; reviewed by jmckenzie for CASSANDRA-11949
 2016-06-28 13:46:38 -04:00
Sylvain Lebresne 6555a87bde Merge commit '017ec3e99e704db5e1a36ad153af08d6e7eca523' into cassandra-2.2 
* commit '017ec3e99e704db5e1a36ad153af08d6e7eca523':
  Avoid stalling Paxos when the paxos state expires
 2016-06-28 15:18:27 +02:00
Sylvain Lebresne 017ec3e99e Avoid stalling Paxos when the paxos state expires 
This commit does 2 things:
- It ignores MRCs that are old enough to have expired in some nodes paxos tables
- It ensures the same timestamp is used when reading the paxos state and ignoring old MRC

patch by slebresne; reviewed by jasobraown for CASSANDRA-12043
 2016-06-28 15:16:00 +02:00
Marcus Eriksson 3b448b3378 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-06-28 10:16:49 +02:00
Paulo Motta 2811f15bc9 Remove finished incoming streaming connections from MessagingService 
patch by Paulo Motta; reviewed by Marcus Eriksson for CASSANDRA-11854
 2016-06-28 10:13:24 +02:00
Jonathan Ellis 6fcf3353b6 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-06-27 11:13:56 -05:00
Jonathan Ellis 341b3fbfb4 backport fix for flaky testExportColumnsWithMetadata from 2.2 2016-06-27 11:13:48 -05:00
Marcus Eriksson 5d0d30e4d3 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-06-23 15:10:35 +02:00
Marcus Eriksson 9358e589e2 Don't try to get sstables for non-repairing column families 
Patch by marcuse; reviewed by Paulo Motta for CASSANDRA-12077
 2016-06-23 14:49:59 +02:00
Marcus Eriksson 225232a9ea Merge branch 'cassandra-2.1' into cassandra-2.2 2016-06-23 11:22:57 +02:00
Jérôme Mainaud 774e59dc3d Allow nodetool info to run with readonly JMX access 
Patch by Jérôme Mainaud; Reviewed by Paulo Motta for CASSANDRA-11755
 2016-06-23 11:12:21 +02:00
Marcus Eriksson 3c8421a330 Avoid marking too many sstables as repaired 
Patch by marcuse; reviewed by Joel Knighton for CASSANDRA-11696
 2016-06-23 11:08:24 +02:00
Sylvain Lebresne 0171259d05 Merge commit '452d626a7a6b03917b7bd72a5dfe9da8a27e0903' into cassandra-2.2 
* commit '452d626a7a6b03917b7bd72a5dfe9da8a27e0903':
  Fix handling of clustering key > 64K
 2016-06-23 10:57:32 +02:00
Lerh Chuan Low 452d626a7a Fix handling of clustering key > 64K 
Prevent select statements with clustering key > 64k,
nicer error message when writing a value larger than unsigned short,
catch Throwable for OutboundTCPConnection.

Patch by Lerh Chuan Low; reviewed by Branimir Lambov for CASSANDRA-11882
 2016-06-23 10:52:14 +02:00
Rei Odaira 8d5b7b6288 Fix CompressorTest on non-x86 environment 
patch by ReiOdaira; reviewed by blambov for CASSANDRA-11913
 2016-06-23 10:29:22 +02:00
Sylvain Lebresne b3dd05e216 Merge branch 'cassandra-2.1' into cassandra-2.2 
* cassandra-2.1:
  Avoid clock skew corrupting other nodes through paxos
 2016-06-23 09:55:56 +02:00
Sylvain Lebresne 720870bd7f Avoid clock skew corrupting other nodes through paxos 
patch by slebresne; reviewed by jasobrown for CASSANDRA-11991
 2016-06-23 09:52:52 +02:00
Arindam Gupta 9e85e85bf2 Validate bloom_filter_fp_chance during table creation 
Patch by Arinadm Gupta; reviewed by Tyler Hobbs for CASSANDRA-11920
 2016-06-21 11:12:15 -05:00
Benjamin Lerer 5a096274dc Merge branch cassandra-2.1 into cassandra-2.2 2016-06-21 16:25:23 +02:00
Alex Petrov 85f2bbfd1c Remove distinction between non-existing static columns and existing but null in LWTs 
Path by Alex Petrov; reviewed by Benjamin Lerer for CASSANDRA-9842
 2016-06-21 16:22:23 +02:00
Dikang Gu 68398ada7e RandomAccessReader: call isEOF() only when rebuffering, not for every read operation 
patch by Dikang Gu; reviewed by Stefania Alborghetti for CASSANDRA-12013
 2016-06-21 08:36:00 +02:00
Sam Tunnicliffe 142f358f69 Don't send new node notification on restart 
Patch by Sam Tunnicliffe; reviewed by Joel Knighton for CASSANDRA-11038
 2016-06-20 12:55:27 +01:00
Rei Odaira fd91e15939 Fix TimeTypeTest - comparing AbstractType.compare() with -1 or 1. 
Patch by rodaira; reviewed by jmckenzie for CASSANDRA-11948
 2016-06-17 12:49:20 -04:00
Josh McKenzie 0d8e7b18e5 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-06-17 12:39:37 -04:00
Rei Odaira a56bc1600b Set correct MCL_CURRENT and MCL_FUTURE values on IBM POWER to support mlockall(2) through JNA 
Patch by rodaira; reviewed by jmckenzie for CASSANDRA-11576
 2016-06-17 12:38:25 -04:00
Carl Yeksigian dbefa854b4 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-06-15 10:39:09 -04:00
Carl Yeksigian 615bf3721e ninja fix license headers 2016-06-15 10:29:27 -04:00
Robert Stupp c2566d1cf9 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-06-15 11:44:57 +02:00
Mahdi Mohammadi 2f74831f42 Cache local ranges when calculating repair neighbors 
patch by Mahdi Mohammadi; reviewed by Paulo Motta for CASSANDRA-11933
 2016-06-15 11:43:27 +02:00
Carl Yeksigian 52a827b4d2 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-06-14 08:55:58 -04:00
Carl Yeksigian 1d2d0749a8 Allow LWT operation on static column with only partition keys 
Patch by Carl Yeksigian, reviewed by Benjamin Lerer for CASSANDRA-10532
 2016-06-14 08:32:26 -04:00
Marcus Eriksson 05f8a008f6 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-06-13 15:00:08 +02:00
Marcus Eriksson 72acbcd00f Create interval tree over canonical sstables to avoid missing sstables during streaming 
patch by marcuse; reviewed by benedict for CASSANDRA-11886
 2016-06-13 14:31:47 +02:00
Stefania Alborghetti 593bbf57dd Merge branch 'cassandra-2.1' into cassandra-2.2 2016-06-10 15:52:44 -05:00