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

1049 Commits

Author SHA1 Message Date
Michael Shuler 000381ab12 Increment to version 3.0.15 2017-06-26 18:50:40 -05:00
Michael Shuler 0163b97449 Increment to version 2.2.11 2017-06-26 18:46:28 -05:00
Jeff Jirsa 57a03017c1 Upgrade snappy-java to 1.1.2.6 
Patch by Jeff Jirsa; Reviewed by Jason Brown for CASSANDRA-13336
 2017-06-19 15:42:30 -07:00
Michael Shuler e0eac52640 Merge branch 'cassandra-3.11' into trunk 2017-06-15 14:09:20 -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 f5531e1206 Merge branch 'cassandra-3.11' into trunk 2017-06-15 07:30:46 -07: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 ea57a4dbe8 Merge branch cassandra-3.11 into trunk 2017-05-31 14:52:30 +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
Sankalp Kohli bf911cc6a8 RangeStreamer should be smarter when picking endpoints for streaming 
Patch by Sankalp Kohli; reviewed by marcuse for CASSANDRA-4650
 2017-05-12 09:15:15 +02:00
T Jake Luciani d45cd7e658 Merge branch 'cassandra-3.11' into trunk 2017-04-25 09:30:25 -04: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
Jay Zhuang 6a8f150315 Upgrade junit from 4.6 to 4.12 
patch by Jay Zhuang; reviewed by Robert Stupp for CASSANDRA-13360
 2017-03-23 11:00:05 +01:00
Joel Knighton fe08463c3b Fix builds fetching source for all dependencies 
patch by Joel Knighton; reviewed by Dave Brosius for CASSANDRA-13306
 2017-03-15 21:06:35 -05:00
Michael Shuler c0f99c4e68 Fix 2.2 build on byteman-install dependency 2017-03-01 18:47:07 -06:00
Jeff Jirsa 21b4cae615 Merge branch 'cassandra-3.11' into trunk 2017-03-01 13:46:58 -08: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 4bb5ada535 Merge branch 'cassandra-3.11' into trunk 2017-02-28 19:57:57 -05: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 a0827fb2e7 Merge branch 'cassandra-3.11' into trunk 2017-02-14 23:26:55 +00: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 0811824abb Merge branch 'cassandra-3.11' into trunk 2017-02-09 21:13:14 +01: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 bc4f4074be Merge branch 'cassandra-3.11' into trunk 2017-02-01 05:57:49 -08: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
Dave Brosius e96ce6d132 clean up dead imports 2017-01-29 21:22:18 -05:00
Stefania Alborghetti 2d56fee4f5 Merge branch 'cassandra-3.X' into trunk 2017-01-11 08:17:06 +01: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
Ben Manes c607d76413 Use Caffeine (W-TinyLFU) for on-heap caches 
patch by Ben Manes; reviewed by Robert Stupp for CASSANDRA-10855
 2017-01-01 11:00:42 +01:00
Sam Tunnicliffe bb20b9dd8c Ninja: fix ant javadoc target 2016-12-13 11:14:36 +00:00
Sylvain Lebresne 4881d9c308 Thrift removal 
patch by Sylvain Lebresne; reviewed by Aleksey Yeschenko for CASSANDRA-11115
 2016-12-13 10:27:12 +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 93a06b9ea9 Merge branch 'cassandra-3.X' into trunk 2016-10-27 11:43:07 +02: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
Benjamin Lerer 4c728d2e48 Merge branch cassandra-3.X into trunk 2016-10-25 12:13:53 +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 65405b9ed5 Merge branch cassandra-3.X into trunk 2016-10-20 17:24:32 +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
Michael Shuler 87034cd059 Prepare 2.1.16 release 2016-10-05 17:18:52 -05:00
Sylvain Lebresne 78ff377075 Change version to 4.0 after creation of 3.X branch 2016-09-29 10:19:34 +02:00
Michael Shuler 238393520c Bump base.version to 2.2.9 2016-09-28 13:10:06 -05:00
Michal Matloka e7fb0639db Upgrade metrics-reporter-config to 3.0.3 
Patch by Michał Matłoka; reviewed by tjake for CASSANDRA-12089
 2016-09-28 08:12:03 -04:00
Michael Shuler e9fe96f404 Bump base.version and d/changelog to 2.2.8 2016-09-23 16:42:46 -05:00
T Jake Luciani 517b652f57 bump version to 3.10 2016-09-20 09:24:35 -04:00
nitsanw e73633cd81 Fix Cassandra Stress reporting thread model and precision 
Patch by Nitsan Wakart; reviewed by tjake for CASSANDRA-12585
 2016-09-07 10:14:20 -04:00
T Jake Luciani 1d7466425b Make jmh jar and add RW + Compaction tests 
Patch by tjake; reviewed by Nitsan Wakart for CASSANDRA-12586
 2016-09-06 10:13:33 -04:00
Dave Brosius 6abba68aee update jmh jars to 1.13 to quell build time RELEASE_6 warnings 
patch by dbrosius reviewed by bwilliams for CASSANDRA-12536
 2016-09-03 22:57:35 -04:00
Tyler Hobbs 7bdb2dddcb Fix leftover merge conflicts in build.xml 2016-08-17 17:33:28 -05:00
Tyler Hobbs 1e8533a316 Merge branch 'cassandra-3.9' into trunk 2016-08-17 17:06:57 -05:00
Tyler Hobbs b2a6309737 Merge branch 'cassandra-3.8' into cassandra-3.9 2016-08-17 17:05:47 -05:00
Tyler Hobbs 062bd0730a Merge branch 'cassandra-3.0' into cassandra-3.8 2016-08-17 17:05:15 -05:00
Tyler Hobbs 01ae2794e5 Ninja: temporarily remove test-clientutil-jar from test-all 
This is a temporary measure to fix test-all until CASSANDRA-11635 can be
properly fixed and allow test-clientutil-jar to work again.
 2016-08-17 17:03:30 -05:00
Michael Shuler 8b5b1854c3 Update build.xml and debian/changelog for 3.0.9 2016-08-16 18:04:08 -05:00
Michael Shuler 5d23afc15f Update build.xml and debian/changelog for 3.9 2016-08-16 17:52:19 -05:00
Tyler Hobbs a3e772b8b9 Remove clientutil jar 2016-08-11 13:51:46 -05:00
Tyler Hobbs f4c3e14fde Merge branch 'cassandra-3.0' into cassandra-3.9 2016-08-11 13:47:11 -05:00
Tyler Hobbs 2a828afdbf Merge branch 'cassandra-2.2' into cassandra-3.0 2016-08-11 13:46:47 -05:00
Sylvain Lebresne 5b38d3a81e Add Sigar to classes included in clientutil.java 
This is required as Sigar is now a dependency of UUIDGen.

Patch by Sylvain Lebresne; reviewed by Tyler Hobbs for CASSANDRA-11635
 2016-08-11 13:41:22 -05:00
Yuki Morishita bc9af92e80 Add byteman support for testing in 2.2 
patch by yukim; reviewed by Paulo Motta for CASSANDRA-12377
 2016-08-08 07:53:34 -05:00
Dave Brosius f01aedcfb6 remove transitive junit dependency from hadoop-core/commons-httpclient 2016-08-06 21:24:59 -04:00
T Jake Luciani 143d16961a Merge branch 'cassandra-3.9' into trunk 2016-08-05 11:54:28 -04:00
T Jake Luciani aab33f1170 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-08-05 11:54:08 -04:00
T Jake Luciani 1cce9eb5b8 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-08-05 11:34:14 -04:00
Stefan Podkowinski 3cda6829cc Add JVM metrics for custom metrics reporter 
patch by Stefan Podkowinski; reviewed by tjake for CASSANDRA-12312
 2016-08-05 11:03:14 -04:00
Robert Stupp becd730ad3 Update OHC to v0.4.4 (failed to load Java8 implementation ohc-core-j8) 
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-12133
 2016-08-02 10:50:24 +02:00
Sylvain Lebresne 7eb9531a4d Add theme for inclusion of the documentation on the website 2016-08-01 17:19:50 +02:00
Aleksey Yeschenko c3ded0551f Update build.xml and CHANGES.txt for 3.8 2016-07-18 16:47:52 +01:00
T Jake Luciani 7a06b39300 Merge branch 'cassandra-3.9' into trunk 2016-07-18 10:55:47 -04:00
T Jake Luciani 2aa76632d6 Netty 4.0.39-Final update post .37 fix 2016-07-18 10:53:22 -04:00
Stefania Alborghetti 2444349e36 Merge branch 'cassandra-3.9' into trunk 2016-07-06 12:58:57 +08:00
Stefania Alborghetti 78f077de07 Revert "Update to Netty 4.0.37" 
This reverts commit e8d7fe8a28.
 2016-07-06 12:58:06 +08:00
Christopher Batey b73f581355 Add basic testing support for the Cassandra Stress tool 
Patch by Christopher Batey; reviewed by Joel Knighton for CASSANDRA-11638
 2016-07-04 14:48:52 +01:00