Commit Graph

982 Commits

Author SHA1 Message Date
Michael Shuler aee02e4854 Update version to 3.11.2 2017-10-10 17:19:20 -05:00
Alex Petrov 478d54db46 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-07-18 08:36:07 +02:00
Benjamin Lerer 00a777ec8a Downgrade JNA to 4.2.2
Patch by Benjamin Lerer; reviewed by Alex Petrov for CASSANDRA-13072
2017-07-18 08:35:59 +02:00
Ariel Weisberg e406700cf1 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-07-11 14:16:59 -04:00
Jay Zhuang 2400d07bf5 Set test.runners based on cores and memory size
patch by Jay Zhuang; reviewed by Ariel Weisberg for CASSANDRA-13078
2017-07-11 14:08:14 -04:00
Michael Shuler 24389f4809 Increment to version 3.11.1 2017-06-26 18:56:43 -05:00
Michael Shuler 000381ab12 Increment to version 3.0.15 2017-06-26 18:50:40 -05:00
Michael Shuler 5ea7f7c6f2 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-06-15 14:06:45 -05:00
Michael Shuler 5b8ae9f039 Merge branch 'cassandra-2.2' into cassandra-3.0 2017-06-15 14:06:30 -05:00
Michael Shuler 13e153b090 Merge branch 'cassandra-2.1' into cassandra-2.2 2017-06-15 14:06:17 -05:00
Michael Shuler fdb8c96108 Switch MAT to fetch jars from repo.maven.apache.org 2017-06-15 14:03:06 -05:00
Jason Brown 3f725c9e84 ninja-fix the build script make test-compression depend on stress-build. needed due to CASSANDRA-13188 2017-06-15 07:29:27 -07:00
Benjamin Lerer 8405f7366f Revert "upgrade JNA version to 4.4.0"
This reverts commit 3c81aa825d.
2017-05-31 15:14:22 +02:00
Benjamin Lerer 54ff61931c Merge branch cassandra-3.0 into cassandra-3.11 2017-05-31 14:44:42 +02:00
Benjamin Lerer a2f742cd63 Merge branch cassandra-2.2 into cassandra-3.0 2017-05-31 14:42:17 +02:00
Benjamin Lerer 3c81aa825d upgrade JNA version to 4.4.0
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko  for CASSANDRA-13072
2017-05-31 14:37:10 +02:00
Jay Zhuang 2369faab79 Fix compaction-stress by using daemonInitialization
Patch by Jay Zhuang; reviewed by tjake for CASSANDRA-13188
2017-04-25 09:25:44 -04:00
Ariel Weisberg cba5c7fa8b Merge branch 'cassandra-2.1' into cassandra-2.2 2017-04-21 16:18:59 -04:00
Ariel Weisberg 572fef8a06 Set javac encoding to utf-8
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13466
2017-04-21 16:15:42 -04:00
Michael Shuler 30b01a02fe Increment version to 3.0.14 2017-04-14 20:02:43 -05:00
Michael Shuler 25f106554a Increment version to 3.0.13 2017-03-29 21:59:11 -05:00
Michael Shuler c0f99c4e68 Fix 2.2 build on byteman-install dependency 2017-03-01 18:47:07 -06:00
Jeff Jirsa be0deb90e4 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-03-01 13:45:59 -08:00
Jeff Jirsa 218743dc39 Merge branch 'cassandra-2.2' into cassandra-3.0 2017-03-01 13:44:55 -08:00
Jeff Jirsa 9bbb449736 Merge branch 'cassandra-2.1' into cassandra-2.2 2017-03-01 13:43:37 -08:00
Robert Stupp 301f7c5b7b Remove unused repositories
Patch by Robert Stupp; Reviewed by Michael Shuler for CASSANDRA-13278
2017-03-01 13:40:04 -08:00
Ariel Weisberg 760d6c33d5 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-02-28 19:54:59 -05:00
Ariel Weisberg 56d3f93249 Merge branch 'cassandra-2.2' into cassandra-3.0 2017-02-28 19:49:52 -05:00
Ariel Weisberg aa66c999ad Fix "multiple versions of ant detected..." when running ant test
Patch by Michael Kjellman; Reviewed by Ariel Weisberg for CASSANDRA-13232
2017-02-28 19:43:06 -05:00
Michael Shuler 0eae9084e6 Increment to version 3.0.12 2017-02-21 14:07:09 -06:00
Michael Shuler 7841908c3c Increment to version 2.2.10 2017-02-21 14:03:53 -06:00
Michael Shuler de1f24d70f Increment to version 2.1.18 2017-02-21 14:00:54 -06:00
Aleksey Yeschenko 515e4a2276 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-02-14 23:26:39 +00:00
Aleksey Yeschenko 76ad028f67 Merge branch 'cassandra-2.2' into cassandra-3.0 2017-02-14 23:26:19 +00:00
Nate McCall 753d90cd77 Quick fix: Add missing developers to build.xml file. 2017-02-14 23:20:23 +00:00
Robert Stupp 6d5cd2d459 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-02-09 20:50:41 +01:00
Robert Stupp a696ab33ba Merge branch 'cassandra-2.2' into cassandra-3.0 2017-02-09 20:38:17 +01:00
Robert Stupp f0f9cf232b Merge branch 'cassandra-2.1' into cassandra-2.2 2017-02-09 20:37:32 +01:00
Stefan Podkowinski eb0f443705 Upgrade netty to 4.0.44 to fix memory leak with client encryption
patch by Stefan Podkowinski; reviewed by Robert Stupp for CASSANDRA-13114
2017-02-09 20:36:07 +01:00
Michael Shuler f71e7e1fed Increment version to 3.11.0 2017-02-03 18:27:02 -06:00
Marcus Eriksson 9820ae543b Merge branch 'cassandra-3.0' into cassandra-3.11 2017-02-01 05:57:32 -08:00
Marcus Eriksson 5dd1abda21 Dump threads when unit tests time out
Patch by marcuse; reviewed by Jason Brown for CASSANDRA-13117
2017-02-01 05:51:51 -08:00
Stefania Alborghetti 1553d864b5 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-01-11 08:16:18 +01:00
Jay Zhuang 15b52809f2 Fix tabs and typo
patch by Jay Zhuang; reviewed by Stefania Alborghetti for CASSANDRA-11431
2017-01-11 08:10:41 +01:00
Paulo Motta d98446ede1 Set javac encoding to utf-8
patch by Paulo Motta, reviewed by jasobrown for CASSANDRA-11077
2017-01-11 08:10:41 +01:00
Michael Shuler ac279e2f71 Increment version to 3.0.11 and fix a CHANGES entry 2016-11-16 14:31:31 -06:00
Robert Stupp 8f0d5a295d remove net.mintern.primitive library due to license issue,
remove primitive-1.0.jar, add ASL2 licensed TimSort implementation, update snowball-stemmer license file

patch by Robert Stupp; reviewed by  for CASSANDRA-12845
2016-10-27 11:42:05 +02:00
Stefan Podkowinski 6497d3727f Use different build directories for Eclipse and Ant
patch by Stefan Podkowinski; reviewed by Benjamin Lerer for CASSANDRA-12466
2016-10-25 12:01:54 +02:00
Benjamin Lerer af1afef564 Upgrade commons-codec to 1.9
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko  for CASSANDRA-12790
2016-10-20 17:21:02 +02:00
Michael Shuler 83ae5f3398 Bump version to 2.1.17 2016-10-10 17:09:10 -05:00