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

13030 Commits

Author SHA1 Message Date
Mikhail Stepura 310d6e4efb Merge branch 'cassandra-2.1' into trunk 2014-05-08 13:33:00 -07:00
Mikhail Stepura a0d096b036 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-08 13:32:40 -07:00
Mikhail Stepura 51f9e9804d Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	bin/cqlsh
 2014-05-08 13:31:03 -07:00
Mikhail Stepura 8abe9f6f52 cqlsh should return a non-zero error code if a query fails 
patch by Branden Visser and Mikhail Stepura; reviewed by Mikhail Stepura for CASSANDRA-6344
 2014-05-08 13:27:41 -07:00
Sylvain Lebresne 28497fd11b Merge branch 'cassandra-2.1' into trunk 2014-05-08 18:05:28 +02:00
Sylvain Lebresne 8dab582c24 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-08 18:05:13 +02:00
Sylvain Lebresne d6f32e4fc0 Fix potential NumberFormatException when deserializing IntegerType 
patch by slebresne; reviewed by jbellis for CASSANDRA-7088
 2014-05-08 18:03:08 +02:00
Sylvain Lebresne 6e79342807 Merge branch 'cassandra-2.1' into trunk 2014-05-08 18:00:07 +02:00
Sylvain Lebresne 3b299c4ca1 Fix CollectionTypeTest 2014-05-08 17:59:52 +02:00
Jonathan Ellis 7da562053f Fix marking commitlog segments clean 
patch by bes; reviewed by jbellis for CASSANDRA-6959
 2014-05-08 10:51:59 -05:00
Marcus Eriksson 1753f3749a Merge branch 'cassandra-2.1' into trunk 2014-05-08 08:19:35 +02:00
Marcus Eriksson af802014d6 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-08 08:18:25 +02:00
Marcus Eriksson 0490abff4e Check if autocompaction should be disabled before enabling it during startup. 
Patch by marcuse; reviewed by driftx for CASSANDRA-7187
 2014-05-08 08:14:24 +02:00
Dave Brosius 70360cf258 Merge branch 'cassandra-2.1' into trunk 2014-05-08 00:39:50 -04:00
Dave Brosius 1b1f0b0790 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-08 00:39:13 -04:00
Dave Brosius 16fd1a4a89 fix c* launch issues on Russian os's due to output of linux 'free' cmd 
patch by dbrosius reviewed by bwilliams for cassandra-6162
 2014-05-08 00:32:29 -04:00
Dave Brosius 67ed3375b2 Merge branch 'cassandra-2.1' into trunk 2014-05-07 21:23:38 -04:00
Dave Brosius 773b95efb8 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-07 21:22:27 -04:00
Dave Brosius fb0a78a23a Merge branch 'cassandra-1.2' into cassandra-2.0 2014-05-07 21:19:00 -04:00
Dave Brosius d839350f42 reduce garbage creation in calculatePendingRanges 
patch by dbrosius reviewed by bwilliams for cassandra-7191
 2014-05-07 21:17:48 -04:00
Jason Brown e48a00b6da Merge branch 'cassandra-2.1' into trunk 2014-05-07 16:35:11 -07:00
Jason Brown d267cf88c8 make sure manifest's parent dirs exist before trying to write the file. 2014-05-07 16:34:29 -07:00
Dave Brosius e241319b23 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-07 19:25:38 -04:00
Dave Brosius c4fcb16699 return all cpu values from BackgroundActivityMonitor.readAndCompute 
patch by dbrosius reviewed by jbellis for cassandra-7183
 2014-05-07 19:20:13 -04:00
Brandon Williams 9ffb195697 Merge branch 'cassandra-2.1' into trunk 2014-05-07 18:11:56 -05:00
Brandon Williams 39b0d0e3ef don't use o.a.commons.io for one method 2014-05-07 18:11:47 -05:00
Jonathan Ellis d6eb9e8bd4 Merge branch 'cassandra-2.1' into trunk 2014-05-07 16:53:40 -05:00
Jonathan Ellis ce7bf5e994 Add snapshot "manifest" describing files included 
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6326
 2014-05-07 16:53:32 -05:00
Brandon Williams c37cceef52 Merge branch 'cassandra-2.1' into trunk 2014-05-07 16:30:48 -05:00
Brandon Williams 311c276426 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-07 16:30:40 -05:00
Brandon Williams dceb739f32 Remove unused isLocalTask method. 
Patch by Lyuben Todorov, reviewed by brandonwilliams for CASSANDRA-7181
 2014-05-07 16:30:05 -05:00
Brandon Williams 66429d6189 Merge branch 'cassandra-2.1' into trunk 2014-05-07 16:24:52 -05:00
Brandon Williams 8c58dd30e1 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	conf/cassandra-env.sh
 2014-05-07 16:24:43 -05:00
Brandon Williams ea0c399912 Improve error message when trying >= 2.0 on java < 1.7 
Patch by brandonwilliams reviewed by thobbs for CASSANDRA-7137
 2014-05-07 16:23:11 -05:00
Jake Luciani 56c76bebe2 Merge branch 'cassandra-2.1' into trunk 2014-05-07 16:56:13 -04:00
Jake Luciani 60dbe8b700 Fix broken build 2014-05-07 16:55:53 -04:00
Jake Luciani fe2d7ddafa Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
 2014-05-07 15:22:00 -04:00
Jake Luciani 0cb1db68fc Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
 2014-05-07 15:18:49 -04:00
Jake Luciani ea7d0c827a Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/streaming/AbstractStreamSession.java
 2014-05-07 15:10:14 -04:00
Jason Brown 05bacaeabc Starting threads in the OutboundTcpConnectionPool constructor causes race conditions 
patch by sbtourist; reviewed by jasobrown for CASSANDRA-7177
 2014-05-07 11:58:56 -07:00
Jake Luciani adea05f58a Merge branch 'cassandra-2.1' into trunk 2014-05-07 14:30:32 -04:00
Jake Luciani 411abc78e1 Merge branch 'cassandra-1.2' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/streaming/AbstractStreamSession.java
 2014-05-07 14:27:09 -04:00
Jake Luciani 21b3a679f0 Raise the phi convict threshold check in 1.2 
patch by tjake; reviewed by jbellis for CASSANDRA-7063
 2014-05-07 13:17:33 -04:00
Sylvain Lebresne 6cecbf914d Merge branch 'cassandra-2.1' into trunk 2014-05-07 11:08:28 +02:00
Sylvain Lebresne 9da58ed354 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
 2014-05-07 11:07:58 +02:00
Sylvain Lebresne 2e61cd5e07 Validate statements inside batch 2014-05-07 10:53:09 +02:00
Sylvain Lebresne 0ca4942403 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-07 10:50:54 +02:00
Sylvain Lebresne 19ff1932cd Remove duplicate entries in changelog 2014-05-07 10:30:14 +02:00
Sylvain Lebresne 32e1b16b81 Warn when timestamps are provided on CAS batch 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-7067
 2014-05-07 10:27:04 +02:00
Dave Brosius 2629c30a92 Merge branch 'cassandra-2.1' into trunk 2014-05-07 01:40:57 -04:00