Commit Graph

271 Commits

Author SHA1 Message Date
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 3796e8fa3e bump versions 2015-06-30 09:53:25 -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
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 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
Brandon Williams 68fdb2db2f Merge branch 'cassandra-2.1' into trunk 2014-11-20 14:32:08 -06:00
Brandon Williams 705e5e47d1 bump python version to 2.7 2014-11-20 14:31:59 -06:00
Jake Luciani 19c2d22e93 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	NEWS.txt
	build.xml
2014-11-05 16:04:24 -05:00
Jake Luciani 44e9f23d4f Prep for 2.1.2 2014-11-05 15:56:15 -05:00
Jake Luciani 4fd3349e2e Merge branch 'cassandra-2.1' into trunk
Conflicts:
	build.xml
2014-11-05 15:44:03 -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
Brandon Williams 60c0cad17a Merge branch 'cassandra-2.1' into trunk 2014-10-23 11:57:20 -05:00
Brandon Williams 0126760f6d Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
2014-10-23 11:57:00 -05:00
Sylvain Lebresne 02b83d9a8c Update versions for 2.0.11 2014-10-21 16:23:52 +02:00
Brandon Williams b6b08f281b Merge branch 'cassandra-2.1' into trunk 2014-10-17 15:14:21 -05:00
Sylvain Lebresne 8fca88e306 Update news/version for 2.1.1 2014-10-17 13:45:08 +02:00
Joshua McKenzie 861c4cf2de Integrate Sigar library and add basic OS performance checks on startup
Patch by Amit Kumar and Josh McKenzie; reviewed by tjake for (CASSANDRA-7838)
2014-10-09 12:32:57 -04:00
Brandon Williams ba6bc8dd35 Merge branch 'cassandra-2.1' into trunk 2014-10-03 12:37:39 -05:00
Brandon Williams 4539237ab6 Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	debian/rules
2014-10-03 12:37:28 -05:00
Brandon Williams 8952d6ca92 Set base C* version in debs and strip -N, ~textN, +textN
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-8046
2014-10-03 12:36:44 -05:00
Brandon Williams 1f10bcbbbb Add bash-completion to debian/control Build-Depends
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-8040
2014-10-02 13:34:47 -05:00
Brandon Williams 116d05b3e3 Merge branch 'cassandra-2.1' into trunk 2014-10-02 13:34:20 -05:00
Brandon Williams f1847a78c7 Add bash-completion to debian/control Build-Depends
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-8040
2014-10-02 13:33:27 -05:00
Aleksey Yeschenko 380273826d Remove cassandra-cli
patch by Aleksey Yeschenko; reviewed by Brandon Williams and Jason Brown
for CASSANDRA-7920
2014-09-24 18:33:29 -07:00
Jake Luciani 192468f7a2 Ninja fix debian rules to handle versions with -N package convention 2014-09-22 15:32:36 -04:00
Brandon Williams 3909567da6 Fix logging dir in debian package
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-7941
2014-09-15 20:15:21 +00:00
Brandon Williams 23b957c5aa Merge branch 'cassandra-2.0' into cassandra-2.1 2014-09-12 13:14:57 -05:00
Brandon Williams 6c6c723b9c Allow pid file to be read by mere mortals.
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-7851
2014-09-12 13:14:04 -05:00
Sylvain Lebresne c6a2c65a75 Update versions and NEWS file for 2.1.0 release 2014-09-07 15:25:31 +02:00
Sylvain Lebresne 35e4e77071 Update version number for 2.1.0-rc7 2014-08-28 16:33:05 +02:00
Brandon Williams 4dc3a6e38c Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
	debian/init
2014-08-26 10:39:59 -05:00
Brandon Williams 6b7697589d Export JVM_OPTS in debian init
Patch by Matt Robenolt, reviewed by Michael Shuler for CASSANDRA-7802
2014-08-26 10:33:45 -05:00
Sylvain Lebresne 74847893c8 Versions for 2.1.0-rc6 2014-08-09 13:47: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