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

1445 Commits

Author SHA1 Message Date
Mick Semb Wever 7816301ef2
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-01-29 23:19:17 +01:00
Mick Semb Wever 531dc2a46a
ninja-fixes: `ant publish` needs to have built the artifacts, and update the cassandra_logdir_fix debian patch after CASSANDRA-14306 2020-01-29 23:02:59 +01:00
Mick Semb Wever f1e94db34c
Merge branch 'cassandra-3.11' into trunk 2020-01-28 07:58:11 +01:00
Mick Semb Wever d71625a42e
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-01-28 07:56:59 +01:00
Mick Semb Wever 5508fecf54
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-01-28 07:53:24 +01:00
Mick Semb Wever 06a36045fe
Source and build artifacts are published with sha512 checksums 
patch by Mick Semb Wever; reviewed by Michael Shuler for CASSANDRA-14970
 2020-01-28 07:51:12 +01:00
Blake Eggleston 1f7e3c2835 Fix in-jvm dtest java 11 compatibility 
Patch by Blake Eggleston; Reviewed by Alex Petrov and David Capwell for CASSANDRA-15463
 2020-01-27 14:13:50 -08:00
Boris Tsirkin 2dbae87c78 Remove joda time dependency. 
Patch by Boris Tsikin, reviewed by brandonwilliams for CASSANDRA-15257
 2020-01-23 11:19:36 -06:00
Mick Semb Wever 8f7f6e903b
Merge branch 'cassandra-3.11' into trunk 2020-01-21 19:12:38 +01:00
Mick Semb Wever 6a8e211fba
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-01-21 19:10:59 +01:00
Mick Semb Wever 14aa561c32
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-01-21 19:08:52 +01:00
Mick Semb Wever d69f7696e4
Create Jenkins pipeline definition, and split out Jenkins test-all builds to individual builds for each of the test targets 
patch by Mick Semb Wever; reviewed by David Capwell for CASSANDRA-15496
 2020-01-21 18:59:16 +01:00
yifan-c 1fbd3297a9 Release session from cache when closing QueryReplayer 
Patch by Yifan Cai; reviewed by marcuse for CASSANDRA-15514
 2020-01-20 15:00:25 +01:00
Marcus Eriksson 8da277e573 Merge branch 'cassandra-3.11' into trunk 2020-01-16 11:06:56 +01:00
Marcus Eriksson 3bb388b364 Merge branch 'cassandra-3.0' into cassandra-3.11 2020-01-16 11:02:31 +01:00
Marcus Eriksson 5f57212267 Run in-jvm upgrade dtests in circle ci 
Patch by marcuse; reviewed by Alex Petrov for CASSANDRA-15506
 2020-01-16 10:56:18 +01:00
Ekaterina Dimitrova 82dc72088f Integrate SJK into nodetool 
Patch by Ekaterina Dimotrova, reviewed by brandonwilliams for
CASSANDRA-12197
 2020-01-10 11:41:12 -06:00
Mick Semb Wever e3af8fff74
Bump copyright to 2009-2020 2020-01-01 14:16:08 +01:00
Michael Shuler 6d93f046c2 Increment version to 4.0-alpha3 2019-10-29 16:17:35 -05:00
Michael Shuler fb50d823b6 Increment version to 3.11.6 2019-10-29 16:15:49 -05:00
Michael Shuler ae366ba615 Increment version to 3.0.20 2019-10-29 16:11:57 -05:00
Michael Shuler a593d7b358 Increment version to 2.2.16 2019-10-29 16:09:30 -05:00
Dinesh A. Joshi 5d401f3a39 Merge branch 'cassandra-3.11' into trunk 2019-10-08 14:15:06 -07:00
Dinesh A. Joshi 4675b3fd33 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-10-08 14:10:40 -07:00
Sumanth Pasupuleti 38b49904dd
Upgrading Guava to 27, and to java-driver 3.6.0 (from 3.4.0-SNAPSHOT), plus refactoring to remove nativePort argument for NativeSSTableLoaderClient constructor 
Patch by Sumanth Pasupuleti; reviewed by Michael Semb Wever for CASSANDRA-14655
 2019-10-07 21:19:42 +02:00
Marvin Froeder bc5fc8bc2d
Move chronicle-core version from SNAPSHOT to STABLE, and include carrotsearch on pom.xml dependency list 
Closes #358

 patch by Marvin Froeder; reviewed by Mick Semb Wever for CASSANDRA-15321
 2019-09-22 19:22:20 +02:00
Mick Semb Wever 21ebba85ac
Update version to 4.0-alpha2 2019-09-10 07:17:51 +02:00
Michael Shuler 145f6d6dc4 Set base.version and changelog to 4.0-alpha1 2019-09-05 12:06:43 -07:00
Blake Eggleston 96ac94dabc ninja: fix ant artifacts on java 8 2019-08-31 11:27:19 -07:00
Jon Meredith 7dc5b700b7 Merge branch 'cassandra-3.11' into trunk 2019-08-20 16:10:59 +01:00
Jon Meredith 3df63ed054 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-08-15 14:21:23 -06:00
Jon Meredith 51c0f6b2f0 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-08-15 14:14:48 -06:00
Jon Meredith 8dcaa12baa Allow instance class loaders to be garbage collected for inJVM dtest 
Backport support optional network/gossip test features,
instance generations and subnet support from trunk.

Backport MessageFilter and cluster builder API changes to match
trunk (except for the change in namespace for Verbs).

Add a test for repeatedly creating/tearing down in-JVM dtest
clusters to help find resource leaks.

Change IsolatedExecutor to clean up on an executor with zero
core threads so that it exits sooner enabling GC on the
InstanceClassLoader.  Moved classloader close after shutdown to prevent
improve logging when the isolated executor is shutdown.

Update the logback config for dtests to make it obvious
which log threads are for instances vs the main logger.

Disable native library loading until it can be reinstated
(tracked in CASSANDRA-15170).

Shutdown various executors and threads that were
preventing the instance classloader from being unloaded.

Add test-jvm-dtest-some ant target

Patch by Jon Meredith; Reviewed by Alex Petrov and
Benedict Elliott Smith for CASSANDRA-15170
 2019-08-15 10:12:06 -06:00
Aleksey Yeshchenko a339aa9e98 Update Netty dependencies to latest, clean up SocketFactory 
patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for
CASSANDRA-15195
 2019-07-02 19:39:34 +01:00
Benedict Elliott Smith 310a48efcf Rewrite the internode messaging subsystem 
patch by Aleksey Yeschenko and Benedict Elliott Smith; reviewed by Alex
Petrov, Aleksey Yeschenko, and Benedict Elliott Smith for CASSANDRA-15066

Co-authored-by: Aleksey Yeschenko <aleksey@apache.org>
Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
 2019-06-12 16:26:54 +01:00
Ted Petersson a9a4f171be Fix JDK7 compatibility broken in cassandra-2.2 
Patch by Ted Petersson; Reviewed by Michael Shuler for CASSANDRA-15050
 2019-06-06 11:27:38 -05:00
Michael Shuler 2d3157cb8c Merge branch 'cassandra-3.0' into cassandra-3.11 2019-05-22 15:15:46 -04:00
Michael Shuler fa6b40f460 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-05-22 15:09:25 -04:00
Michael Shuler 63ff65a8dd Switch http to https URLs in build.xml 
Patch by Michael Shuler; Reviewed by Joshua McKenzie for CASSANDRA-15137
 2019-05-22 15:03:43 -04:00
Michael Shuler ca0ea40eea Switch http to https URLs in build.xml 
Patch by Michael Shuler; Reviewed by Joshua McKenzie for CASSANDRA-15137
 2019-05-21 17:54:11 -04:00
Blake Eggleston aa762c6d52 Support building Cassandra with JDK 11 
Patch by Blake Eggleston; Reviewed by Dinesh Joshi and Sam Tunnicliffe for CASSANDRA-15108
 2019-05-10 13:46:27 -07:00
Blake Eggleston 587961a19c Merge branch 'cassandra-3.11' into trunk 2019-04-25 10:23:40 -07:00
Blake Eggleston 01d6548e0d Merge branch 'cassandra-3.0' into cassandra-3.11 2019-04-25 10:21:55 -07:00
Blake Eggleston c3ce32e239 Fix assorted gossip races and add related runtime checks 
Patch by Blake Eggleston; Reviewed by Ariel Weisberg for CASSANDRA-15059
 2019-04-25 10:20:46 -07:00
Mick Semb Wever ed2d32612a
Apache NetBeans "Run", "Debug", "Profile" IDE actions 
patch by Mick Semb Wever ; reviewed by Dinesh Joshi for CASSANDRA-15083
 2019-04-18 12:07:15 +10:00
Blake Eggleston 9063ceabc9 Fix AbstractBTreePartition locking in java 11 
Patch by Blake Eggleston; Reviewed by Benedict Elliot Smith for CASSANDRA-14607
 2019-03-25 14:24:16 -07:00
Marcus Eriksson a85196246c Merge branch 'cassandra-3.11' into trunk 2019-03-15 10:02:00 +00:00
Marcus Eriksson 0c2d99244d Merge branch 'cassandra-3.0' into cassandra-3.11 2019-03-15 09:56:16 +00:00
Marcus Eriksson 7bda2a0619 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-03-15 09:52:43 +00:00
Stefan Podkowinski 7333c2b04d Refactor Circle CI configuration 
Enable high resource settings by copying .circleci/config.yml.HIGHRES
to .circleci/config.yml. For more details, see .circleci/readme.md

Patch by Stefan Podkowinski; reviewed by marcuse for CASSANDRA-14806
 2019-03-15 09:47:27 +00:00
Mick Semb Wever 9ecec33c41
Merge branch 'cassandra-3.11' into trunk 2019-03-08 19:54:37 +11:00
Mick Semb Wever 84fc68ce3f
Fix copyright years in generated apidocs and in the NOTICE file 
Patch by Bernhard M. Wiedemann; reviewed by Mick Semb Wever for CASSANDRA-15039
 2019-03-08 19:51:10 +11:00
Alex Petrov 5c4c75cac7 Merge branch 'cassandra-3.11' into trunk 2019-02-25 14:20:03 +01:00
Alex Petrov 7b462ec467 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-02-25 14:16:19 +01:00
Alex Petrov b27cc37abd Merge branch 'cassandra-2.2' into cassandra-3.0 2019-02-25 14:14:19 +01:00
Alex Petrov a7d8ba7b10 Fix memory-retention problem arising from thread locals from schema change in in-jvm tests 
patch by Alex Petrov; reviewed by Joseph Lynch for CASSANDRA-15014
 2019-02-25 14:00:16 +01:00
Dinesh Joshi dccf53061a Add Zstd compressor 
Patch by Dinesh Joshi; Reviewed by Blake Eggleston for CASSANDRA-14482
 2019-02-22 15:06:06 -08:00
Michael Shuler 123113f7b8 Update version to 3.11.5 2019-02-11 21:16:03 -06:00
Michael Shuler 229f8b3a44 Update version to 3.0.19 2019-02-11 21:09:23 -06:00
Michael Shuler ce6bcaa5b8 Update version to 2.2.15 2019-02-11 21:01:30 -06:00
Benedict Elliott Smith 2209115972 Merge branch 'cassandra-3.11' into trunk 2019-02-05 10:53:05 +00:00
Benedict Elliott Smith a6059f1fee Merge branch 'cassandra-3.0' into cassandra-3.11 2019-02-05 10:52:17 +00:00
Benedict Elliott Smith aa2a5c6994 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-02-05 10:51:28 +00:00
Benedict Elliott Smith c100f1ac40 Multi-version in-JVM dtests 
patch by Benedict; reviewed by Alex Petrov for CASSANDRA-14937
 2019-02-05 10:49:16 +00:00
Michael Shuler fd47391aae Update version to 3.11.4 2019-02-01 12:40:38 -06:00
Michael Shuler edd52cef50 Update version to 3.0.18 2019-02-01 12:38:25 -06:00
Michael Shuler af91658353 Update version to 2.2.14 2019-02-01 12:36:13 -06:00
Michael Shuler 9bb75358df Update version to 2.1.21 2019-02-01 12:33:15 -06:00
Benedict Elliott Smith 2d05bff0ba Merge branch 'cassandra-3.0' into cassandra-3.11 2019-01-21 17:44:36 +00:00
Benedict Elliott Smith 459945bcf4 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-01-21 17:43:26 +00:00
Joseph Lynch 8ad4a9a522 In JVM dtests need to clean up after instance shutdown 
Adds additional cleanup logic to ensure we don't leak classloaders and
their associated objects when running the in JVM dtests.

Patch by Joseph Lynch; reviewed by Alex Petrov for CASSANDRA-14922
 2019-01-21 10:13:48 +00:00
Alex Petrov 1d5e0301f3 Introduce in-jvm distributed tests 
Patch by Alex Petrov and Benedict Elliott Smith; reviewed by Benedict Elliott Smith and Dinesh Joshi for CASSANDRA-14821.

Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
 2019-01-21 10:13:48 +00:00
Michael Shuler f8e32649a3 Merge branch 'cassandra-3.11' into trunk 2019-01-14 11:40:11 -06:00
Michael Shuler 6a7aa0f07e Merge branch 'cassandra-3.0' into cassandra-3.11 2019-01-14 11:39:15 -06:00
Michael Shuler 24a708dbcd Merge branch 'cassandra-2.2' into cassandra-3.0 2019-01-14 11:37:56 -06:00
Michael Shuler 900292b2e4 Merge branch 'cassandra-2.1' into cassandra-2.2 2019-01-14 11:37:19 -06:00
Michael Shuler 6506684b81 Update release checksum algorithms to SHA-256, SHA-512 
Patch by Michael Shuler; reviewed by Brandon Williams for CASSANDRA-14970
 2019-01-14 11:26:03 -06:00
Michael Shuler 315d23b184 Update git.apache.org URLs to gitbox.apache.org 2019-01-09 13:35:44 -06:00
Michael Shuler 0d81fca44e Update URLs for gitbox.apache.org migration 2019-01-09 14:17:03 +00:00
Joseph Lynch d5005627b0 In JVM dtests need to clean up after instance shutdown 
Adds additional cleanup logic to ensure we don't leak classloaders and
their associated objects when running the in JVM dtests.

Patch by Joseph Lynch; reviewed by Alex Petrov for CASSANDRA-14922
 2019-01-09 15:00:16 +01:00
Marcus Eriksson 11384c3279 Merge branch 'cassandra-3.11' into trunk 2018-12-20 13:44:53 +01:00
Marcus Eriksson 08363afa53 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-12-20 13:41:48 +01:00
Marcus Eriksson 23d722ee3a move task definition inside testmacro to not fail build if ant-junit is not installed 
Patch by marcuse; reviewed by Jon Meredith for CASSANDRA-14915
 2018-12-20 13:38:28 +01:00
Alex Petrov f22fec927d Introduce in-jvm distributed tests 
Patch by Alex Petrov and Benedict Elliott Smith; reviewed by Benedict Elliott Smith and Dinesh Joshi for CASSANDRA-14821.

Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
 2018-11-16 19:41:58 +01:00
Aleksey Yeshchenko bf6ddb3bc8 Merge branch 'cassandra-3.11' into trunk 2018-10-23 23:35:49 +01:00
Aleksey Yeshchenko 6308fb21da Merge branch 'cassandra-3.0' into cassandra-3.11 2018-10-23 23:27:09 +01:00
Jon Meredith e07d53aaec Fix flaky LongBufferPoolTest 
patch by Jon Meredith; reviewed by Dinesh Joshi for CASSANDRA-14790
 2018-10-23 23:22:13 +01:00
Jay Zhuang 876666abe7 Enable snapshot artifacts publish 
So "ant publish" is able to upload snapshot artifacts to artifactory.

patch by Jay Zhuang; reviewed by Mick Semb Wever for CASSANDRA-12704
 2018-09-27 17:39:22 -07:00
Sam Tunnicliffe 65fb17a88b Add checksumming to the native protocol 
Patch my Michael Kjellman and Sam Tunnicliffe; reviewed by Dinesh Joshi
and Jordan West for CASSANDRA-13304
 2018-09-01 22:41:37 +01:00
Marcus Eriksson f83bd5ac2b Add fqltool compare 
Patch by marcuse; reviewed by Jason Brown and Dinesh Joshi for CASSANDRA-14619
 2018-09-01 09:59:21 +02:00
Jay Zhuang 2e59ea8c7f Improve BTree build performance by avoiding data copy 
patch by Jay Zhuang; reviewed by Benedict for CASSANDRA-9989
 2018-08-30 07:48:10 -07:00
Jason Brown a4053682e8 Update netty to 4.1.128 
patch by jasobrown; reviewed by Dinesh Joshi for CASSANDRA-14633
 2018-08-10 05:13:35 -07:00
Marcus Eriksson 9bc15bacea Default project generation to java8 
Patch by marcuse; reviewed by Benedict for CASSANDRA-14613
 2018-07-31 15:57:56 +02:00
Robert Stupp 6ba2fb9395 Make C* compile and run on Java 11 and Java 8 
patch by Robert Stupp; reviewed by Jason Brown for CASSANDRA-9608
 2018-07-26 18:20:00 +02:00
Michael Shuler aed1b5fdf1 Update version to 3.11.3 2018-07-02 13:37:32 -05:00
Michael Shuler c4e6cd2a1a Update version to 3.0.17 2018-07-02 13:31:09 -05:00
Michael Shuler 9ff78249a0 Update version to 2.2.13 2018-07-02 13:27:39 -05:00
Jay Zhuang 958e13d166 Merge branch 'cassandra-3.11' into trunk 2018-06-08 10:48:15 -07:00
Jay Zhuang ed5f8347ef Remove BTree.Builder Recycler to reduce memory usage 
patch by Jay Zhuang; reviewed by jasobrown for CASSANDRA-13929
 2018-06-08 10:40:06 -07:00
Jay Zhuang 069e383f57 Merge branch 'cassandra-3.11' into trunk 2018-05-30 22:02:21 -07:00
Jay Zhuang b92d90dc14 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-05-30 22:00:51 -07:00
Shichao An 38096da25b Add missing dependencies in pom-all 
patch by Shichao An; reviewed by Jay Zhuang for CASSANDRA-14422
 2018-05-30 21:55:53 -07:00
Lerh Chuan Low 76ef78b7d7 Bump jackson version to >= 2.9.5 
patch by Lerh Chuan Low; reviewed by jasobrown for CASSANDRA-14427
 2018-05-17 22:26:54 -07:00
dr3s 14bfc94937
Upgrade metrics to fix reconnect when reporting metrics. (backported) 
Patch by dr3s and Jeff Jirsa; Reviewed by Mick Semb Wever for CASSANDRA-12924
 2018-05-11 12:54:24 +10:00
Michael Burman d0e2b9ca99 Add test.conf directory to JMH benchmarks.jar 
Patch by Michael Burman; Reviewed by Jeff Jirsa for CASSANDRA-14287
 2018-03-04 17:46:01 -08:00
Jay Zhuang f7d140e2a9 Merge branch 'cassandra-3.11' into trunk 2018-02-27 21:47:24 -08:00
Jay Zhuang c4946960a2 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-02-27 21:40:25 -08:00
Jay Zhuang 79cead093e Add new developer to build.xml file 2018-02-27 19:12:02 -08:00
Michael Shuler c0aa79e545 CVE-2017-5929 Security vulnerability and redefine default log rotation policy. 
Patch by Michael Shuler; Reviewed by Ariel Weisberg for CASSANDRA-14183
 2018-02-14 16:30:43 -05:00
Jay Zhuang 7a424bc2a7 Update Intellij JUnit configuration 
And other ninja build fixes.

patch by Jay Zhuang; reviewed by Stefan Podkowinski for CASSANDRA-14169
 2018-02-14 16:32:24 +01:00
Ariel Weisberg da58565ebc Revert ProtocolVersion changes from CASSANDRA-7544 
Patch by Ariel Weisberg; Reviewd by Jason Brown for CASSANDRA-14211
 2018-02-01 17:20:00 -05:00
Ariel Weisberg 59b5b6bef0 Allow storage port to be configurable per node 
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-7544
 2018-01-25 14:32:24 -05:00
Jason Brown 39837d4793 Merge branch 'cassandra-3.11' into trunk 2018-01-10 05:17:06 -08:00
Jason Brown 4faa6e12ff Merge branch 'cassandra-3.0' into cassandra-3.11 2018-01-10 05:10:54 -08:00
Johannes Grassler fde05f4f1b Set encoding for javadoc generation 
patch by Johannes Grassler; reviewed by jasobrown for CASSANDRA-14154
 2018-01-10 05:07:48 -08:00
Jay Zhuang 6cd4009333 Add long-testsome target to run specific long test 
patch by Jay Zhuang; reviewed by Stefan Podkowinski for CASSANDRA-14111
 2017-12-19 10:19:23 +01:00
Jay Zhuang 7a320260e0 Add helper comments for unittest debugging 
patch by Jay Zhuang; reviewed by Stefan Podkowinski for CASSANDRA-13077
 2017-12-19 10:08:40 +01:00
Ariel Weisberg ae837806bd Support a means of logging all queries as they were invoked. 
Patch by Ariel Weisberg; Reviewed by Blake Eggleston
 2017-12-04 18:06:30 -05:00
Jon Haddad db81f6bffe Created docker configuration to build sphinx docs. 
Patch by Joaquin Casares; Reviewed by Jon Haddad for CASSANDRA-13915.

This closes #154 (GH PR)
 2017-12-04 13:49:10 -08:00
Marcus Eriksson ec6282242b Upgrade Guava to 23.3 and Airline to 0.8 
Patch by marcuse; reviewed by Stefan Podkowinski for CASSANDRA-13997
 2017-11-09 09:51:05 +01:00
Jason Brown 77a352b26b Merge branch 'cassandra-3.11' into trunk 2017-11-08 15:59:30 -08:00
DOAN DuyHai df37bcb7cb Add asm jar to build.xml for maven builds 
patch by DOAN DuyHai; reviewed by jasobrown for CASSANDRA-11193
 2017-11-08 15:56:49 -08:00
Alex Petrov 922dbdb658 Add result set metadata to prepared statement MD5 hash calculation 
Patch by Alex Petrov; reviewed by Robert Stupp for CASSANDRA-10786
 2017-10-11 16:15:29 +02:00
Michael Shuler aee02e4854 Update version to 3.11.2 2017-10-10 17:19:20 -05:00
Michael Shuler a04d627140 Update version to 3.0.16 2017-10-10 17:14:47 -05:00
Michael Shuler 797de4ae3c Update version to 2.2.12 2017-10-05 10:22:46 -05:00
Michael Shuler d4fd82be5d Update version to 2.1.20 2017-10-05 10:19:50 -05:00
Michael Kjellman 55772088e0 Upgrade lz4 to 1.4.0 
patch by Michael Kjellman; reviewed by jasobrown for CASSANDRA-13741
 2017-09-29 05:47:32 -07:00
Jason Brown e38015ed1f ninja-fix build.xml netty version to 4.1.14 as jar is already updated in lib dir 2017-09-05 04:52:43 -07:00
Jason Brown 356dc3c253 switch internode messaging to netty 
patch by jasobrown, reviewed by pcmanus for CASSANDRA-8457
 2017-08-22 13:54:44 -07:00
Marcus Eriksson 8378bfc510 Merge branch 'cassandra-2.2' into cassandra-3.0 2017-08-18 19:18:57 +02:00
Marcus Eriksson 9b6fd54a4e Merge branch 'cassandra-2.1' into cassandra-2.2 2017-08-18 19:16:56 +02:00
Marcus Eriksson a3498d5eb7 CASSANDRA-13775 followup - use 4 containers still 
Patch by marcuse; reviewed by Eduard Tudenhoefner for CASSANDRA-13775
 2017-08-18 19:15:46 +02:00
dr3s 1e7c4b9c05 Upgrade metrics to fix reconnect when reporting metrics. 
Closes #123

Patch by dr3s and Jeff Jirsa; Reviewed by Stefan Podkowinski for CASSANDRA-13648
 2017-07-27 16:51:07 -07:00
Jay Zhuang d4bfa59842 Upgrade JMH from 1.13 to 1.19 
patch by Jay Zhuang; reviewed by jasobrown for CASSANDRA-13727
 2017-07-25 05:17:54 -07:00
Stefan Podkowinski 481e600346 Exclude transitive slf4j dependencies 
patch by Stefan Podkowinski; reviewed by Robert Stupp for CASSANDRA-12996
 2017-07-25 12:35:01 +02:00
Joel Knighton 77aba07daf Increment version to 2.1.19 2017-07-24 13:21:16 -05:00
Stefan Podkowinski 948fdfc679 Upgrade slf4j to 1.7.25 
patch by Stefan Podkowinski; reviewed by Robert Stupp for CASSANDRA-12996
 2017-07-20 20:41:55 +02:00
Alex Petrov fd06571400 Merge branch 'cassandra-3.11' into trunk 2017-07-18 08:36:18 +02: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 19914dc1d1 Merge branch 'cassandra-3.11' into trunk 2017-07-11 14:28:31 -04: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
Stefan Podkowinski f415b736d6 Upgrade airline dependency to 0.7 
patch by Tomas Repik; reviewed by Stefan Podkowinski for CASSANDRA-12994
 2017-07-01 12:24:22 +02: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 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
Dave Brosius 1df47bd76c add ./conf as an eclipse source path so that the hotspot_compiler file gets copied to classes, on eclipse scrub 2016-06-30 19:20:24 -04:00
T Jake Luciani ea8c430124 version 2.2.7 2016-06-28 20:10:15 -04:00
T Jake Luciani cb14186f8d version 2.1.15 2016-06-28 20:06:55 -04:00
T Jake Luciani 0134348331 update to version 3.10 2016-06-27 21:02:37 -04:00
T Jake Luciani 7d4a71f636 update to version 3.9 2016-06-27 21:01:32 -04:00
Sylvain Lebresne c7b9401bf8 Merge branch 'doc_in_tree' into trunk 
* doc_in_tree:
  Modify build file to include html doc in artifacts
  Add 'report bug' section
  Fix minor errors in CQL doc
  Finish fixing the CQL doc
  Don't track auto-generated file
  Reorganize document
  Automatically generate docs for cassandra.yaml
  Fix CQL doc (incomplete)
  Add Metrics/Monitoring docs
  Add Change Data Capture documentation
  Docs for Memtable and SSTable architecture
  Add doc on compaction
  Add initial version of security section
  Fill in Replication, Tuneable Consistency sections
  Add docs for cqlsh
  Add snitch and range movements section on Operations
  Add initial in-tree documentation (very incomplete so far)
 2016-06-27 20:33:21 +02:00
Sylvain Lebresne 5cefe503e0 Modify build file to include html doc in artifacts 2016-06-27 20:31:43 +02:00
Robert Stupp e8d7fe8a28 Update to Netty 4.0.37 
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-12032
 2016-06-21 16:47:37 +02:00
Dave Brosius a6e749089f exclude thrift-server's 'compile' dependency on junit 2016-06-18 22:52:15 -04:00
Josh McKenzie e31e216234 Add Change Data Capture 
Patch by jmckenzie; reviewed by cyeksigian and blambov for CASSANDRA-8844
 2016-06-16 10:01:39 -04:00
Sylvain Lebresne cad277be41 Add initial in-tree documentation (very incomplete so far) 
patch by Stefania, jjirsa, rspitzer & slebresne; reviewed by slebresne for CASSANDRA-8700
 2016-06-14 18:16:42 +02:00
T Jake Luciani 972157d98d bump version to 3.0.8 2016-06-14 10:48:52 -04:00
T Jake Luciani 15ec93041a bump version 2016-05-31 13:45:21 -04:00
nitsanw 89f275c658 Introduce HdrHistogram and response/service/wait separation to stress tool 
Patch by Nitsan Wakart; reviewed by tjake for CASSANDRA-11853
 2016-05-27 11:59:55 -04:00
Robert Stupp b8f4ae0043 build: use correct netty version sources 
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-11869
 2016-05-23 17:11:58 +02:00
Edward Capriolo fb466f99f8 Support older ant versions 
Patch by Ed Capriolo; reviewed by tjake for CASSANDRA-11807
 2016-05-17 13:06:52 -04:00
T Jake Luciani f580fb0ff2 Merge branch 'cassandra-3.7' into trunk 2016-05-06 09:11:06 -04:00
T Jake Luciani 886f875714 Merge branch 'cassandra-3.0' into cassandra-3.7 2016-05-06 09:08:35 -04:00
T Jake Luciani 06870372d0 Update java driver 
patch by Andy Tolbert; reviewed by tjake for CASSANDRA-11615
 2016-05-06 09:04:31 -04:00
T Jake Luciani 7bc1f564a4 set trunk version to 3.8 2016-05-03 10:42:47 -04:00
T Jake Luciani 0095499270 Set 3.7 version number 2016-05-03 10:39:33 -04:00
T Jake Luciani cfb9b9e7df Add missing dependency to build.xml - v2 2016-05-03 09:02:59 -04:00
T Jake Luciani 151d8876b9 Add missing dependency to build.xml 2016-05-03 09:01:28 -04:00
T Jake Luciani 7c559def34 Add missing dependency to build.xml 2016-05-03 08:58:24 -04:00
T Jake Luciani 5c5c5b44c6 2.1.14 version bump 2016-04-15 10:30:21 -04:00
T Jake Luciani 220e4f62db 2.2.6 version bump 2016-04-15 10:00:04 -04:00
T Jake Luciani a0d070764a upgrade netty to 4.0.36 
patch by tjake; reviewed by Jason Brown for CASSANDRA-11567
 2016-04-14 10:31:53 -04:00
Tyler Hobbs fd24b7c0d6 Bump version to 3.0.6 in build.xml 2016-04-13 12:51:58 -05:00
Robert Stupp 5e933c542a Fix uptodate check for antlr files after 11372 
patch by Robert Stupp; reviewed by Sylvain Lebresne for CASSANDRA-11480
 2016-04-03 16:17:15 +02:00
T Jake Luciani c6e6fa94d2 3.0.5 version bump 2016-04-02 07:58:13 -04:00
Benjamin Lerer 43ff27fc70 Upgrade Netty to version 4.0.34 
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko for CASSANDRA-11096
 2016-03-30 10:13:51 +02:00
Robert Stupp ae6809d07c Merge branch 'cassandra-3.5' into trunk 2016-03-30 09:01:09 +02:00
Robert Stupp 9b1968fcb6 Merge branch 'cassandra-3.0' into cassandra-3.5 2016-03-30 09:00:41 +02:00
Robert Stupp 500d6b3a2c Upgrade ohc to 0.4.3 
patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-11444
 2016-03-30 09:00:10 +02:00
Mike Adamson eea0a0cef9 Break the CQL grammar into separate Parser and Lexer 
patch by Mike Adamson; reviewed by Aleksey Yeschenko for CASSANDRA-11372
 2016-03-29 18:07:12 +01:00
Aleksey Yeschenko dc480c794e Merge branch 'cassandra-3.5' into trunk 2016-03-09 16:37:35 +00:00
Aleksey Yeschenko e33d4be66c Bump base.version 2016-03-09 16:37:07 +00:00
T Jake Luciani ac06c5bf7d bump versions for 3.0.4 2016-02-29 10:37:34 -05:00
Aleksey Yeschenko fc9c6faa23 Merge branch 'cassandra-3.0' into trunk 2016-02-23 15:30:35 +00:00
Ariel Weisberg 037d24efdf Introduce backpressure for hints 
patch by Ariel Weisberg; reviewed by Benedict Elliott Smith for
CASSANDRA-10972
 2016-02-23 15:28:41 +00:00
Robert Stupp 14420a958f Merge branch 'cassandra-3.0' into trunk 2016-02-18 21:40:41 +01:00
Robert Stupp 9b5df24f5a Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-18 21:40:10 +01:00
Robert Stupp 71f4406072 fix ohc and java-driver pom dependencies in build.xml 
patch by Robert Stupp; reviewed by Jeremiah Jordan for CASSANDRA-10793
 2016-02-18 21:38:23 +01:00
T Jake Luciani 21380fc129 3.0.3 release versions 2016-02-03 08:56:26 -05:00
Paulo Motta 02d8ebd8a4 Set javac encoding to utf-8 
patch by Paulo Motta, reviewed by jasobrown for CASSANDRA-11077
 2016-01-27 07:59:03 -08:00
T Jake Luciani d5b6d1b634 2.1.13 build 2016-01-26 09:12:48 -05:00
Pavel Yaskevich 72790dc8e3 Integrate SASI index into Cassandra 
patch by xedin; reviewed by beobal for CASSANDRA-10661
 2016-01-23 19:35:29 -08:00
Tyler Hobbs b4d67c9e5d Bump 2.2 version to 2.2.5 in build.xml 2016-01-22 12:00:32 -06:00
Tyler Hobbs a20b6ef89f Bump version in build.xml to 3.0.2 2016-01-21 13:17:01 -06:00
Tyler Hobbs 25090c1682 Bump trunk version to 3.4 in build.xml 2016-01-06 17:00:56 -06:00
Aleksey Yeschenko a0f59dce5b Merge branch 'cassandra-3.0' into trunk 2015-12-18 15:43:52 +00:00
Aleksey Yeschenko d877ba073f Eliminate the dependency on jgrapht for UDT resolution 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10653
 2015-12-18 15:39:33 +00:00
T Jake Luciani cf567703db 3.0 bump version 2015-12-04 15:56:51 -05:00
Tyler Hobbs 47e133c90f Merge branch 'cassandra-3.1' into trunk 2015-12-02 15:33:33 -06:00
Tyler Hobbs 6405f6c9c7 Merge branch 'cassandra-3.0' into cassandra-3.1 2015-12-02 15:33:04 -06:00
Tyler Hobbs d7068fd72e Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-02 15:32:40 -06:00
Tyler Hobbs e491f05b71 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-02 15:32:16 -06:00
Tyler Hobbs b85da71961 Increase unit test timeout from 1m to 4m 
The new timeout matches what we've been using in CI for some time now.
 2015-12-02 15:31:10 -06:00
T Jake Luciani 16045358a4 bump 2.2 versions 2015-12-02 10:53:01 -05:00
T Jake Luciani a6619e56b1 bump 2.1 versions 2015-12-02 10:50:22 -05:00
Robert Stupp 306d882fe3 Merge branch 'cassandra-3.1' into trunk 2015-11-27 15:26:13 +01:00
Robert Stupp 918bc0116d Merge branch 'cassandra-3.0' into cassandra-3.1 2015-11-27 15:26:08 +01: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
Stefania 7650fc1963 Warn or fail when changing cluster topology live 
patch by Stefania; reviewed by Paulo Motta for CASSANDRA-10243
 2015-11-27 13:49:15 +01:00
Robert Stupp 76c4841b34 Merge branch 'cassandra-3.1' into trunk 2015-11-20 17:24:57 +01:00
Robert Stupp 32a682a5f2 Merge branch 'cassandra-3.0' into cassandra-3.1 2015-11-20 17:24:50 +01:00
Robert Stupp 6ac831f327 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-20 17:24:42 +01:00
Robert Stupp 49d9e51555 Reevaluate inspections in generate-idea-files target 
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9844
 2015-11-20 17:24:03 +01:00
Sylvain Lebresne 3944775e77 Merge branch 'cassandra-3.0' into cassandra-3.1 2015-11-20 13:16:31 +01:00
Sylvain Lebresne 0c04a6bc5b Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-20 13:15:38 +01:00
Sylvain Lebresne 3851670d78 Backport test parallelization build tasks 
patch by rhatch; reviewed by aweisberg for CASSANDRA-10703
 2015-11-20 13:13:54 +01:00
Sylvain Lebresne e7d9678be2 Merge branch 'cassandra-3.1' into trunk 2015-11-20 13:10:51 +01:00
Sylvain Lebresne 7a48a7dbdc Merge branch 'cassandra-3.0' into cassandra-3.1 2015-11-20 13:10:23 +01:00
Sylvain Lebresne d1ad7961ed Remove cobertura from build file 
patch by rhatch; reviewed by aweisberg for CASSANDRA-10704
 2015-11-20 13:08:37 +01:00
Aleksey Yeschenko b42afc424a Merge branch 'cassandra-3.1' into trunk 2015-11-18 18:05:07 +00:00
Aleksey Yeschenko 02a12fa1e9 Set base.version to 3.1 2015-11-18 18:04:13 +00:00
T Jake Luciani 96f407bce5 3.0 release versions 2015-11-06 14:38:34 -05:00
Russ Hatch c3678f6b64 Add ant target for running a list of test classes 
patch by Russ Hatch; reviewed by Ariel Weisberg for CASSANDRA-10651
 2015-11-05 22:55:45 +00:00
Aleksey Yeschenko 1b876bc600 Merge branch 'cassandra-3.0' into trunk 2015-11-04 17:08:43 +00:00
Aleksey Yeschenko 340df43fb7 Use CQL type names in schema metadata tables 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10365
 2015-11-04 17:06:07 +00:00
Russ Hatch b14423c8b4 Allow jacoco report merging 
patch by Russ Hatch; reviewed by Philip Thompson and Ariel Weisberg for
CASSANDRA-10616
 2015-11-04 13:07:02 +00:00
Ryan McGuire e4467a0f6d Provide graphing tool w/cassandra-stress 
Patch by rmcguire; reviewed by jmckenzie for CASSANDRA-7918
 2015-10-21 15:40:26 -04:00
T Jake Luciani 56a06d78f2 bump versions 2015-10-16 16:03:16 -04:00
Aleksey Yeschenko 56cfc6ea35 Remove Pig support 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10542
 2015-10-16 13:23:20 +01: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
Branimir Lambov e77730179c Clean resource usage warnings. 
Patch by Branimir Lambov; reviewed by tjake for CASSANDRA-10385
 2015-10-07 13:20:18 -04:00
Tyler Hobbs 5c2912d1ce Flush system schema tables after local schema changes 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-10429
 2015-10-01 14:25:54 -05: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
blerer 0d4e0cd226 Merge branch cassandra-2.2 into cassandra-3.0 2015-09-16 10:34:00 +02:00
blerer e7c2952d31 Merge branch cassandra-2.1 into cassandra-2.2 2015-09-16 10:21:58 +02:00
blerer b8b4eb76c4 Add Benjamin Lerer to the developer list in build.xml 2015-09-16 10:18:18 +02:00
Michael Shuler f961e84aa6 Set test.timeout back to 60 seconds 
Patch by Michael Schuler; reviewed by Tyler Hobbs for CASSANDRA-10284
 2015-09-08 12:54:25 -05:00
T Jake Luciani 17528910b8 bump versions 2015-09-04 19:11:39 -04:00
Stefania Alborghetti ce63ccc842 Faster sequential IO (CASSANDRA-8630) 
Merge RandomAccessReader and NIODataInputStream class hierarchies
to share performance optimisation work across all readers.

patch by stefania; reviewed by ariel and benedict for CASSANDRA-8630
 2015-09-04 12:42:35 +01: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 5f6da8f959 bump versions 2015-08-21 22:36:48 -04:00
Sam Tunnicliffe 43b18d1802 Re-enable brief output for junit logs from CASSANDRA-9528 2015-08-19 18:11:51 +01:00
Sam Tunnicliffe 06c130e3cb Move 2i metadata out of system_schema.columns and ColumnDefinition 
Patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko and Robert Stupp
for CASSANDRA-6717
 2015-08-18 14:59:44 +01:00
Robert Stupp 6445dd62bb Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-14 17:24:31 +02:00