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

623 Commits

Author SHA1 Message Date
T Jake Luciani 718c144324 bump versions 2015-06-18 14:53:07 -04:00
T Jake Luciani e469f32be1 bump versions 2015-06-05 10:47:35 -04:00
T Jake Luciani 9a0b3956f1 bump version 2015-04-29 14:22:53 -04:00
Dave Brosius 7b83334f30 cassandra-7028 upgraded to antlr-3.5.2 and pulled in a hard org.antlr#stringtemplate dependency. 
But antlr recursively pulls in an org.antlr#ST4 jar which is a complete duplicate of stringtemplate.
So stringtemplate.jar and ST4.jar provide duplicate sets of package/classes, which could cause problems.
Switch to only use ST4, as the normal recursive dependency brings in.
 2015-04-08 23:12:37 -04:00
Robert Stupp 2641424247 Add generate-idea-files target to build.xml 
Patch by Robert Stupp; Reviewed by T Jake Luciani for CASSANDRA-9123
 2015-04-07 18:12:16 +02:00
T Jake Luciani 150f827364 Merge branch 'cassandra-2.1.4-build' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	NEWS.txt
 2015-04-01 10:56:05 -04:00
T Jake Luciani c041ea8b37 Bind JMX to localhost unless explicitly configured otherwise 2015-03-30 09:38:50 -04:00
Brandon Williams 77d58f900e Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2015-03-17 14:34:26 -05:00
Brandon Williams b2aa67ea29 Allow specifying the tmp dir 
Patch by mshuler, reviewed by brandonwilliams for CASSANDRA-7712
 2015-03-17 14:33:27 -05:00
T Jake Luciani 31a182876e bump versions 2015-03-16 11:48:11 -04:00
Brandon Williams 322e8f0595 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-02-26 09:48:50 -08:00
Brandon Williams 98502e0c3f add comment about using testsome target 2015-02-26 09:48:40 -08:00
T Jake Luciani 407b5de67c Upgrade java-driver used by cassandra-stress 
patch by tjake; reviewed by benedict for CASSANDRA-8842
 2015-02-20 11:32:59 -05:00
T Jake Luciani caba0a5920 docs and bump version 2015-02-05 11:11:14 -05:00
T Jake Luciani cdcf6461a3 Upgrade thrift to 0.9.2 
Patch by tjake; reviewed by Philip Thompson for CASSANDRA-8685
 2015-01-30 09:46:02 -05:00
Benedict Elliott Smith c75ee4160c Safer Resource Management 
patch by benedict; review by marcuse for CASSANDRA-7705
 2015-01-28 14:46:16 +00:00
T Jake Luciani 5b66997fa8 prep for 2.0.12 release 2015-01-09 15:21:49 -05:00
blerer 1bb2dd906c Fix size calculations for prepared statements 
Patch by Benjamin Lerer; reviewed by Dave Brosius for CASSANDRA-8231
 2014-11-21 14:54:47 -06:00
Mikhail Stepura 155eccd66e (Eclipse) Re-use test classes from an ant build 
patch by Mikhail Stepura; reviewed by T Jake Luciani for CASSANDRA-8277
 2014-11-07 13:45:36 -08:00
Jake Luciani 44e9f23d4f Prep for 2.1.2 2014-11-05 15:56:15 -05:00
Jake Luciani 4f863be3f7 Fix Cassandra crash when running on JDK8 update 40 
Patch by Michael Schuler; reviewed by Robert Stupp (CASSANDRA-8209)
 2014-11-05 15:28:24 -05:00
Mikhail Stepura 0bc1ea385e Attach existing sources to "Referenced libraries" in Eclipse 
Patch by Mikhail Stepura; reviewed by tjake for CASSANDRA-8240
 2014-11-04 09:34:05 -05:00
Mikhail Stepura a6c58f8b2f Don't compile Thrift sources in Eclipse, use classes for an ant build 
patch by Mikhail Stepura; reviewed by tjake for CASSANDRA-8250
 2014-11-04 09:23:18 -05:00
Mikhail Stepura a8072ae3be Add junitreport target. 
patch by Mikhail Stepura; reviewed by Brandon Williams and Michael Shuler for CASSANDRA-6482
 2014-11-03 14:45:46 -08:00
Sylvain Lebresne 02b83d9a8c Update versions for 2.0.11 2014-10-21 16:23:52 +02:00
Jake Luciani dacddd2668 Upgrade netty to 4.0.23 enable epoll 
Patch by tjake; reviewed by Jason Brown for CASSANDRA-7761
 2014-10-08 16:12:30 -04:00
Dave Brosius 2279d49e96 Allow cassandra to compile under java 8 
patch by dbrosius reviewed by jmckenzie for cassandra-7028
 2014-10-02 12:47:08 -05:00
Jason Brown 8d69214197 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	build.xml
 2014-09-05 16:45:20 -07:00
Pavel Yaskevich e6f307f4e5 bump thrift-server version to 0.3.7 to properly shutdown invocation pool shutdown 
patch by Pavel Yaskevich; tested by Philip Thompson for CASSANDRA-7594
 2014-09-05 14:23:24 -07:00
Jason Brown cae8715750 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	build.xml
	lib/thrift-server-0.3.5.jar
	lib/thrift-server-0.3.6.jar
 2014-09-03 10:45:52 -07:00
Pavel Yaskevich b22089d7c8 Make disruptor_thrift_server invocation pool configurable 
patch by Pavel Yaskevich; reviewed by Jason Brown for CASSANDRA-7594
 2014-09-02 16:14:27 -07:00
Sylvain Lebresne 94f1107eca Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
 2014-08-22 16:16:46 +02:00
Sylvain Lebresne 8da134377a Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	build.xml
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
 2014-08-22 16:15:50 +02:00
Sylvain Lebresne 200b802884 Update java driver to 2.0.5 (for hadoop) 2014-08-22 16:11:44 +02:00
Sylvain Lebresne 5db108c314 Support list index operation with conditions 
patch by slebresne; reviewed by thobbs for CASSANDRA-7499
 2014-08-18 10:22:40 +02:00
Joshua McKenzie 74e7f28f7f fix generate-eclipse-files build.xml target on JDK 8 
Patch by Robert Stupp, reviewed by Josh McKenzie for CASSANDRA-7430
 2014-08-13 17:10:23 -05:00
Joshua McKenzie 54215a21f0 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-12 16:40:15 -05:00
Joshua McKenzie dc8b4e1118 build.xml - exclude *.ps1 from fixcrlf 
Patch by Robert Stupp; review by Joshua McKenzie for CASSANDRA-7690
 2014-08-12 16:37:20 -05:00
Aleksey Yeschenko f2f2d47324 Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
 2014-08-11 01:07:32 +03:00
Sylvain Lebresne 74847893c8 Versions for 2.1.0-rc6 2014-08-09 13:47:44 +02:00
Sylvain Lebresne 8aed4196d2 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-08 12:50:44 +02:00
Sylvain Lebresne a932b62eae Include stress yaml examples in release and deb 
patch by tjake and mshuler; reviewed by mshuler and slebresne for CASSANDRA-7717
 2014-08-08 12:49:25 +02:00
Sylvain Lebresne cd37d07baf Version and licenses for 2.0.10 release 2014-08-08 10:54:41 +02:00
Aleksey Yeschenko 6beb13f19c Synchronise build.xml developers list with ASF C* committers 
See https://people.apache.org/committers-by-project.html#cassandra and
https://wiki.apache.org/cassandra/Committers
 2014-08-07 00:48:23 +03:00
Sylvain Lebresne e6602f7639 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-05 10:22:07 +02:00
Sylvain Lebresne 95d289b849 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
	build.xml
 2014-08-05 10:21:48 +02:00
Sylvain Lebresne 5151fd5bcc Update java driver to 2.0.4 (for hadoop) 
patch by alexliu68; reviewed by slebresne for CASSANDRA-7618
 2014-08-05 10:18:58 +02:00
Dave Brosius 8d06dd102d Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-03 00:39:59 -04:00
Sylvain Lebresne cfb335e39b Update versions for 2.1.0-rc5 release 2014-08-02 13:48:00 +02:00
Brandon Williams 1e2a5b0ee3 Pig support for hadoop CqlInputFormat 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6454
 2014-07-23 10:26:50 -05:00