Commit Graph

301 Commits

Author SHA1 Message Date
Marcus Eriksson f61cc0d88e Fix debian install script
Patch by Michael Shuler; reviewed by marcuse for CASSANDRA-10851
2015-12-14 08:22:41 +01:00
Nicolas Lalevée 2cd18ef5a0 Add compressor name in the output of sstablemetadata
Patch by Nicolas Lalevee; reviewed by marcuse for CASSANDRA-9879
2015-12-11 14:38:34 +01:00
T Jake Luciani e092873728 3.1 version 2015-12-04 16:00:43 -05:00
Robert Stupp 9a2fd8ccf3 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-27 15:26:02 +01:00
Robert Stupp 0ee8895b27 Show CQL help in cqlsh in web browser
patch by Robert Stupp; reviewed by Paulo Motta for CASSANDRA-7225
2015-11-27 15:24:51 +01:00
Robert Stupp b166f5f3fe Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-27 12:58:46 +01:00
Robert Stupp d44dbe1929 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-27 12:58:16 +01:00
Ruggero Marchei 8cd13f1381 Status command in debian/ubuntu init script doesn't work
patch by Ruggero Marchei; reviewed by Michael Shuler for CASSANDRA-10213
2015-11-27 12:57:49 +01:00
T Jake Luciani 96f407bce5 3.0 release versions 2015-11-06 14:38:34 -05:00
Brandon Williams ad007f0124 Fix debian package build
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-10620
2015-10-29 16:06:21 -05:00
Sylvain Lebresne 8be382a7ed Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
	CHANGES.txt
2015-10-21 14:29:58 +02:00
Sylvain Lebresne d3085b1baa Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
	CHANGES.txt
2015-10-21 14:27:46 +02:00
Sylvain Lebresne 9d8436f922 Avoid repetition of JVM_OPTS in debian package
patch by urandom; reviewed by mshuler for CASSANDRA-8821
2015-10-21 14:26:22 +02:00
T Jake Luciani 56a06d78f2 bump versions 2015-10-16 16:03:16 -04:00
Paulo Motta c3b2aedfd8 Define cassandra_storagedir variable in debian/cassandra.in.sh
patch by Paulo Motta; reviewed by Aleksey Yeschenko for CASSANDRA-10525
2015-10-15 23:13:25 +01:00
Paulo Motta 1415fa512a Revert 7486, make CMS default GC, move gc opts to conf/jvm.options
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10403
2015-10-14 14:36:52 -04:00
T Jake Luciani 8444302432 bump versions for 2.2.3 2015-10-12 09:50:39 -04:00
T Jake Luciani df6b27e36c bump versions for 2.1.11 2015-10-12 09:46:49 -04:00
T Jake Luciani ae9b7e0522 bump verion 2015-10-01 09:38:36 -04:00
T Jake Luciani 78f2e7aa01 bump version 2015-10-01 09:36:24 -04:00
T Jake Luciani c95a7098cf bump release 2015-09-19 16:03:29 -04:00
T Jake Luciani 17528910b8 bump versions 2015-09-04 19:11:39 -04:00
T Jake Luciani 3238906477 bump versions 2015-08-25 13:24:57 -04:00
T Jake Luciani 7d74563a25 bump versions 2015-08-25 09:39:15 -04:00
T Jake Luciani 356c755a3b fix debian packaging 2015-08-21 22:55:18 -04:00
T Jake Luciani 5f6da8f959 bump versions 2015-08-21 22:36:48 -04:00
T Jake Luciani b090ed6938 fix debian tools install 2015-07-30 10:16:24 -04:00
T Jake Luciani b44f409885 Fix debian build 2015-07-30 09:51:54 -04:00
T Jake Luciani 17bcb6d085 bump versions for alpha1 2015-07-30 09:31:17 -04:00
T Jake Luciani 13f2c1339c Merge branch 'cassandra-2.2' into trunk
Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
2015-07-17 13:11:23 -04:00
T Jake Luciani b10a51a423 bump versions for 2.2.0 2015-07-17 13:08:37 -04:00
T Jake Luciani e19d013568 Merge branch 'cassandra-2.2' into trunk 2015-07-06 13:39:07 -04:00
T Jake Luciani ebc50d7835 Remove tools/lib from deb rules 2015-07-06 13:38:30 -04:00
T Jake Luciani eb875b4af6 bump versions 2015-07-06 11:19:42 -04:00
T Jake Luciani 3796e8fa3e bump versions 2015-06-30 09:53:25 -04:00
T Jake Luciani 718c144324 bump versions 2015-06-18 14:53:07 -04:00
Benedict Elliott Smith eb266ce8d9 Merge branch 'cassandra-2.2' into trunk
Conflicts:
	build.xml
2015-06-07 12:47:41 +01:00
T Jake Luciani b0ae285bdc bump versions 2015-06-05 11:13:54 -04:00
T Jake Luciani e469f32be1 bump versions 2015-06-05 10:47:35 -04:00
Brandon Williams 6f55427920 Require jdk8 in debian packages
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-9408
2015-05-18 09:52:23 -05:00
T Jake Luciani 1735249ebf debian should use ~ 2015-05-17 22:21:49 -04:00
T Jake Luciani 3add8fbc70 Remove file from deb rules 2015-05-17 21:59:48 -04:00
T Jake Luciani c38968d7e0 deb version 2015-05-17 21:35:38 -04:00
T Jake Luciani 9a0b3956f1 bump version 2015-04-29 14:22:53 -04:00
T Jake Luciani b8717dc201 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	CHANGES.txt
	NEWS.txt
	bin/cassandra.bat
	build.xml
	conf/cassandra-env.sh
	src/java/org/apache/cassandra/service/CassandraDaemon.java
2015-04-01 11:11:53 -04:00
T Jake Luciani c041ea8b37 Bind JMX to localhost unless explicitly configured otherwise 2015-03-30 09:38:50 -04:00
Aleksey Yeschenko 21c5a41f05 Merge branch 'cassandra-2.1' into trunk 2015-02-10 00:47:06 +03:00
T Jake Luciani c1a2e0fa58 bump debian release 2015-02-09 10:35:57 -05:00
Tyler Hobbs 699a69de8d Merge branch 'cassandra-2.1' into trunk 2014-11-21 15:40:53 -06: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