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

13106 Commits

Author SHA1 Message Date
Mihai Suteu b25ddd8a7f cqlsh: ignore .cassandra permission errors 
patch by Mihai Suteu; reviewed by Mikhail Stepura for CASSANDRA-7266
 2014-06-19 15:14:54 +11:00
Mikhail Stepura 03f76a9ccc Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/db/Memtable.java
 2014-06-19 14:56:30 +11:00
Mikhail Stepura 87282f1ad7 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2014-06-19 14:49:40 +11:00
Mikhail Stepura 6131273ac6 Move latch.countDown() into "finally" block 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7275
 2014-06-19 14:47:28 +11:00
Brandon Williams 197d43941e Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-18 15:24:19 -05:00
Brandon Williams 4c476f76f8 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/gms/FailureDetector.java
 2014-06-18 15:24:05 -05:00
Brandon Williams ea837970be Set fd initial value to 2s 
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-7307
 2014-06-18 15:22:29 -05:00
Aleksey Yeschenko 423b62cd35 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/StorageProxy.java
 2014-06-18 13:16:48 -07:00
Aleksey Yeschenko afa304e338 Fix assertion error in CL.ANY timeout handling 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-7364
 2014-06-18 13:13:00 -07:00
Aleksey Yeschenko 43d248f913 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
 2014-06-18 12:57:32 -07:00
Aleksey Yeschenko 760441ba0f Fix BatchlogManagerTest consistency 
patch by Carl Yeksigian; reviewed by Michael Shuler for CASSANDRA-7397
 2014-06-18 12:53:19 -07:00
Brandon Williams cf9b8c998f Upgrade to snappy 1.0.5.1 
Patch by Iheanyi Ekechukwu, reviewed by brandonwilliams for
CASSANDRA-7381
 2014-06-18 14:30:28 -05:00
Brandon Williams 5e35d872ca rm accidental file 2014-06-18 14:19:28 -05:00
Brandon Williams 7c05b897cb nodetool doesn't error when ~/.cassandra is inaccessible 
Patch by Kirk True, reviewed by brandonwilliams for CASSANDRA-6449
 2014-06-18 14:18:13 -05:00
Brandon Williams 590d40375e Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-18 14:17:56 -05:00
Brandon Williams c1b5c270df nodetool doesn't error when ~/.cassandra is inaccessible 
Patch by Kirk True, reviewed by brandonwilliams for CASSANDRA-6449
 2014-06-18 14:16:26 -05:00
Brandon Williams 7bceedf470 Clean up gossiper fully after shadow round. 
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7318
 2014-06-18 14:08:58 -05:00
Brandon Williams 5d25a16efb Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2014-06-18 14:07:50 -05:00
Brandon Williams 20fffa9993 Clean up gossiper fully after shadow round. 
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7318
 2014-06-18 14:06:59 -05:00
Jonathan Ellis 498ee24b52 add file:/// on Windows to -Dcassandra.config value 
patch by Marco Tulio Avila Cerón; reviewed by Lyuben Todorov for CASSANDRA-7398
 2014-06-18 14:05:31 -05:00
Jonathan Ellis d6322a7ec2 fix heap size on Windows 32bit VM 
patch by Joshua McKenzie; tested by Philip Thompson for CASSANDRA-7353
 2014-06-18 14:01:04 -05:00
Brandon Williams 9d6afb4b75 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-18 13:33:12 -05:00
Brandon Williams 4b3a17cda6 Increase socket bind backlog to 500 
Patch by Oleg Anastasyev, reviewed by brandonwilliams for CASSANDRA-7236
 2014-06-18 13:32:19 -05:00
Aleksey Yeschenko d38f677c00 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/Memtable.java
 2014-06-17 18:01:23 -07:00
Aleksey Yeschenko 9afc2097ef Handle empty CFs in Memtable#maybeUpdateLiveRatio() 
patch by Christian Spriegel; reviewed by Aleksey Yeschenko for
CASSANDRA-7401
 2014-06-17 17:59:26 -07:00
Aleksey Yeschenko 5e90091d1e Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
 2014-06-17 17:42:32 -07:00
Aleksey Yeschenko 7801aab8c0 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
 2014-06-17 17:15:31 -07:00
Sam Tunnicliffe febf3854bf Don't insert tombstones that hide indexed values into 2i 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-7268
 2014-06-17 16:26:43 -07:00
Jake Luciani a3dc7b8b41 Upgrade netty to 4.0.20 2014-06-17 15:09:03 -04:00
Jake Luciani a14a01c924 Fix memtable copy bug causing rangetombstones to be missed 
patch by tjake; reviewed by benedict got CASSANDRA-7371
 2014-06-16 16:10:06 -04:00
Brandon Williams a9da3fda5a Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-13 13:35:29 -05:00
Brandon Williams cee1f674aa Merge branch 'cassandra-1.2' into cassandra-2.0 2014-06-13 13:35:19 -05:00
Brandon Williams 593bba94f6 fix wrong patch commit 2014-06-13 13:35:08 -05:00
Brandon Williams a8f5278c8c fix typos 2014-06-13 11:47:27 -05:00
Brandon Williams 9baae7b807 fix merge 2014-06-13 11:35:07 -05:00
Brandon Williams 12025b7ae7 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-13 11:18:52 -05:00
Brandon Williams cc276fb198 fix merge 2014-06-13 11:17:51 -05:00
Brandon Williams 30d3623bcb Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/db/Keyspace.java
 2014-06-13 07:50:41 -05:00
Brandon Williams 55c48c2a00 Track metrics at a keyspace level 
Patch by brandonwilliams, reviewed by yukim for CASSANDRA-6539
 2014-06-13 07:50:06 -05:00
Brandon Williams 68dd634955 Track metrics at a keyspace level 
Patch by brandonwilliams, reviewed by yukim for CASSANDRA-6539
 2014-06-13 07:49:22 -05:00
Brandon Williams 6eda57c1b6 Track metrics at a keyspace level 
Patch by brandonwilliams, reviewed by yukim for CASSANDRA-6539
 2014-06-13 07:48:51 -05:00
Brandon Williams be79ba500e Track metrics at a keyspace level 
Patch by brandonwilliams, reviewed by yukim for CASSANDRA-6539
 2014-06-13 07:47:49 -05:00
Brandon Williams cecd1da318 Track metrics at a keyspace level 
Patch by brandonwilliams, reviewed by yukim for CASSANDRA-6539
 2014-06-13 07:47:12 -05:00
Brandon Williams f1aa49b9f8 Track metrics at a keyspace level 
Patch by brandonwilliams, reviewed by yukim for CASSANDRA-6539
 2014-06-13 07:46:20 -05:00
Jonathan Ellis 4e0656b0bb Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-12 20:43:07 -05:00
Jonathan Ellis b93f287c86 return absolute path from resourceToFile 
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7335
 2014-06-12 20:42:39 -05:00
Brandon Williams 7065b1bdf1 Track metrics at a keyspace level 
Patch by brandonwilliams, reviewed by yukim for CASSANDRA-6539
 2014-06-12 18:48:11 -05:00
Brandon Williams 1e13cbf849 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-12 17:33:26 -05:00
Brandon Williams 53c95ebf31 Don't output a stacktrace when removenode force is errantly called 
Patch by Kirk True, reviewed by brandonwilliams for CASSANDRA-6397
 2014-06-12 17:32:31 -05:00
Jonathan Ellis b9153f4ae5 Modify system tcp keepalive settings in Windows install scripts 
patch by Josh McKenzie; tested by Philip Thompson for CASSANDRA-7348
 2014-06-12 15:05:04 -05:00