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

1256 Commits

Author SHA1 Message Date
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
Peter Palaga 1ba949af40 Unable to start Thrift RPC server in cassandra deployment created using cassandra-all 
patch by Peter Palaga; reviewed by Robert Stupp for CASSANDRA-10071
 2015-08-14 17:23:22 +02:00
Yuki Morishita df3b6027bc ScrubTest should generate out-of-order SSTable on the fly 
with some other ScrubTest fixes.

patch by yukim; reviewed by Stefania Alborghetti for CASSANDRA-9880
 2015-07-30 10:09:07 -05:00
T Jake Luciani 17bcb6d085 bump versions for alpha1 2015-07-30 09:31:17 -04:00
T Jake Luciani f0be8904df Revert "Revert "Fix build, bump version"" 
This reverts commit ce3d9af331.
 2015-07-29 18:29:45 -04:00
Jonathan Ellis ce3d9af331 Revert "Fix build, bump version" 
This reverts commit b93f05d7d1.
 2015-07-29 17:03:46 -05:00
T Jake Luciani b93f05d7d1 Fix build, bump version 2015-07-29 16:53:43 -04:00
Aleksey Yeschenko fb10df212e Merge branch 'cassandra-2.2' into trunk 2015-07-28 18:10:58 +03:00
Ariel Weisberg ae179e4532 Get entropy from /dev/urandom for unit tests 
patch by Ariel Weisberg; reviewed by Aleksey Yeschenko for
CASSANDRA-9581
 2015-07-28 18:03:46 +03:00
Stefania Alborghetti b09e60f72b Introduce safer durable sstable membership management 
(and simplify cleanup of compaction leftovers)

Instead of using temporary files and system tables,
this patch introduces a simple transaction log for sstable
membership edits that can be committed/aborted atomically
and simply replayed on startup.

patch by stefania; reviewed by benedict for CASSANDRA-7066
 2015-07-24 14:41:51 +01:00
Robert Stupp ece5cfc66d Merge branch 'cassandra-2.2' into trunk 2015-07-21 22:38:42 +02:00
Robert Stupp 4601abb911 Cache maven-ant-tasks.jar locally 
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-9757
 2015-07-21 22:38:12 +02:00
Robert Stupp a668638611 Merge branch 'cassandra-2.2' into trunk 2015-07-20 15:17:22 +02:00
Robert Stupp a65953d595 Fix build.xml to not download non-existent source jars, cleanup duplicate artifacts 
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-9845
 2015-07-20 15:16:07 +02:00
Ariel Weisberg 074452efab fix broken classpath for eclipse warnings 
patch by Ariel Weisberg; reviewed by tjake for CASSANDRA-9803
 2015-07-20 08:25:47 -04:00
T Jake Luciani b10a51a423 bump versions for 2.2.0 2015-07-17 13:08:37 -04:00
Ariel Weisberg 177e0dcbe4 For CASSANDRA-9499, update to OHC 0.4 that allow deserialization directly from ByteBuffers 2015-07-15 14:24:35 +01:00
T Jake Luciani 8c22b4a81f Remove crc and adler reflection hacks 
patch by tjake; reviewed by benedict for CASSANDRA-9650
 2015-07-09 11:31:31 -04:00
T Jake Luciani 2ae4163980 Merge branch 'cassandra-2.2' into trunk 
Conflicts:
	CHANGES.txt
 2015-07-08 15:19:45 -04:00
T Jake Luciani 882cf25841 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/utils/FBUtilities.java
 2015-07-08 15:15:58 -04:00
T Jake Luciani 08f4f5a674 Fix clientutil-jar and tests 
patch by tjake; reviewed by Jason Brown for (CASSANDRA-9760)
 2015-07-08 14:28:19 -04:00
Robert Stupp 5eed96789a ninja-add Sam to developers 2015-07-08 18:54:20 +07:00
T Jake Luciani db68d1cfd6 Merge branch 'cassandra-2.2' into trunk 2015-07-07 10:48:42 -04:00
T Jake Luciani 7d31068da9 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	build.xml
 2015-07-07 10:47:36 -04:00
T Jake Luciani 4de943fd9c remove extra ant dep from build 2015-07-07 10:46:13 -04:00
Jeremiah Jordan 43c27e99f7 Update Guava to 18.0 
patch by Jeremiah Jordan; reviewed by Aleksey Yeschenko for
CASSANDRA-9653
 2015-07-07 02:41:57 +03:00
T Jake Luciani eb875b4af6 bump versions 2015-07-06 11:19:42 -04:00
Sam Tunnicliffe dcfd6f308e Merge branch 'cassandra-2.2' into trunk 2015-07-02 11:33:55 +01:00
Stefania Alborghetti e89d54865e Change hinted_handoff_enabled yaml setting, JMX 
patch by Stefania Alborghetti; reviewed by Aleksey Yeschenko for
CASSANDRA-9035
 2015-07-01 19:43:33 +03:00
T Jake Luciani 3796e8fa3e bump versions 2015-06-30 09:53:25 -04:00
Sylvain Lebresne a991b64811 Storage engine refactor, a.k.a CASSANDRA-8099 
Initial patch, see ticket for details
 2015-06-30 12:47:01 +02:00
T Jake Luciani e211008d5a Merge branch 'cassandra-2.2' into trunk 2015-06-29 09:53:46 -04:00
T Jake Luciani bafcb3a568 fix idea files issue 2015-06-29 09:52:57 -04:00
Benedict Elliott Smith bd4a9d18e1 backport burn test refactor 2015-06-28 11:38:22 +01:00
Sam Tunnicliffe 00a34c791e Merge branch 'cassandra-2.2' into trunk 2015-06-26 12:42:20 +01:00
Sam Tunnicliffe 3200d6ce66 Fix generate-eclipse-files ant target 2015-06-26 12:42:01 +01:00
T Jake Luciani 9a71238706 Merge branch 'cassandra-2.2' into trunk 2015-06-25 14:35:10 -04:00
Andrew Tolbert 26bd5124ef Optimize stress driver config for 2.2 
Patch by Andrew Tolbert; reviewed by tjake for CASSANDRA-9558
 2015-06-25 14:28:31 -04:00
Ariel Weisberg c8d3cc1493 Improve log output from unit tests 
patch by Ariel Weisberg; reviewed by Robert Stupp for CASSANDRA-9528
 2015-06-24 08:09:52 +02:00
Yuki Morishita e246ec258c Merge branch 'cassandra-2.2' into trunk 2015-06-18 19:26:43 -05:00
Ariel Weisberg 947edf1f19 Remove usage of suitename that is causing some tasks to silently fail in cassci 
Follow up on CASSANDRA-9583
 2015-06-18 19:26:16 -05:00
Yuki Morishita e14ce11c02 Merge branch 'cassandra-2.2' into trunk 2015-06-18 14:12:15 -05:00
Ariel Weisberg 55a736acff Update and refactor ant test/test-compression to run the tests in parallel 
patch by Ariel Weisberg; reviewed by yukim for CASSANDRA-9583
 2015-06-18 14:10:37 -05:00
T Jake Luciani 718c144324 bump versions 2015-06-18 14:53:07 -04: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
Robert Stupp 78c03052c5 Merge branch 'cassandra-2.2' into trunk 2015-06-04 11:17:42 +02:00
Robert Stupp 16b02887df Integrate pre-release Java Driver 2.2-rc1, custom build 
patch by Robert Stupp; reviewed by Ariel Weisberg for CASSANDRA-9493
 2015-06-04 11:17:05 +02:00
Jason Brown ad58bf7c73 Merge branch 'cassandra-2.2' into trunk 2015-05-29 10:11:09 -07:00
Jason Brown 1352ebd61d ant test-all results incomplete when parsed (part 2) 
patch by aweisberg; reviewed by jasobrown for CASSANDRA-9463
 2015-05-29 10:07:59 -07:00
T Jake Luciani d91eb01169 Merge branch 'cassandra-2.2' into trunk 
Conflicts:
	build.xml
 2015-05-27 17:56:48 -04:00
T Jake Luciani 7aafe053e7 Add Static Analysis to warn on unsafe use of Autocloseable instances 
Patch by tjake and carlyeks, reviewed by benedict for CASSANDRA-9431
 2015-05-27 17:53:26 -04:00
Jason Brown 162489aed5 test-all results incomplete when parsed 
patch by aweisberg; reviewed by jasobrown for CASSANDRA-9463
 2015-05-27 08:39:32 -07:00
Jason Brown 352302f5a7 test-all results incomplete when parsed 
patch by aweisberg; reviewed by jasobrown for CASSANDRA-9463
 2015-05-26 15:29:01 -07:00
Tyler Hobbs 3123e88e54 Merge branch 'cassandra-2.2' into trunk 2015-05-26 14:23:21 -05:00
Ariel Weisberg 91187b542e Allow skipping file syncs during tests 
Patch by Ariel Weisberg; reviewed by Tyler Hobbs for CASSANDRA-9403
 2015-05-26 14:21:18 -05:00
Dave Brosius a2830ef993 Merge branch 'cassandra-2.2' into trunk 2015-05-22 18:48:37 -04:00
Dave Brosius bb1f131047 exclude maven dependency (thru hadoop-core) of core-3.1.1 as it is provided now by ecj 
patch by dbrosius reviewed by bwilliams for cassandra-9410
 2015-05-22 18:47:58 -04:00
Dave Brosius 7c673393de add ecj to cassandra-all's pom 2015-05-17 19:03:42 -04:00
Robert Stupp f58a44763a Generate IDEA project files for Java8 2015-05-15 21:24:51 +02:00
T Jake Luciani ccebac598f Require java 8: CASSANDRA-8168 2015-05-15 12:52:19 -04:00
T Jake Luciani 94480b1f4f beta1 version 2015-05-15 12:49:46 -04:00
Robert Stupp 0282cd550c Use ecj instead of javassist for UDFs 
patch by Robert Stupp; reviewed by Carl Yeksigian for CASSANDRA-8241
 2015-05-15 17:28:21 +02:00
Ariel Weisberg 160e7f2945 faster async logback configuration for tests 
patch by awiesberg; reviewed by beobal for CASSANDRA-9376
 2015-05-15 11:20:35 -04:00
Sam Tunnicliffe 79e1e80627 Swap all references to 3.0 with 2.2 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-9352
 2015-05-14 17:16:54 +03:00
T Jake Luciani a2c05e2e3e Upgrade Snappy library 
Patch by tjake; reviewed by thobbs for (CASSANDRA-9063)
 2015-05-12 14:12:27 -04:00
Benedict Elliott Smith aa811c3936 Introduce test-burn ant target 
patch by ariel for CASSANDRA-9307
 2015-05-06 17:24:56 +01:00
Philip Thompson f698cc2284 Remove Thrift dependencies in bundled tools 
patch by Philip Thompson; reviewed by Aleksey Yeschenko for
CASSANDRA-8358
 2015-05-05 23:57:39 +03:00
T Jake Luciani 9a0b3956f1 bump version 2015-04-29 14:22:53 -04:00
Sam Tunnicliffe 194bad22f7 Add pre-startup checks to detect potential incompatibilities 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-8049
 2015-04-28 15:18:36 +03:00
Dave Brosius 792446a5a9 o.a.c.u.NoSpamLoggerTest uses slf4j's SubstituteLogger, which doesn't exist in 1.7.2 
upgrade slf4j to 1.7.7 which has it.
 2015-04-23 00:48:41 -04:00
Brandon Williams 4a3ca5c70e Allow Cassandra config to be updated to restart Daemon without unloading classes 
Patch by Emmanuel Hugonnet, reviewed by aweisberg for CASSANDRA-9046
 2015-04-13 13:34:31 -05:00
Dave Brosius cbb982cc17 Merge branch 'cassandra-2.1' into trunk 2015-04-08 23:38:38 -04:00
Dave Brosius 7b83334f30 cassandra-7028 upgraded to antlr-3.5.2 and pulled in a hard org.antlr#stringtemplate dependency. 
But antlr recursively pulls in an org.antlr#ST4 jar which is a complete duplicate of stringtemplate.
So stringtemplate.jar and ST4.jar provide duplicate sets of package/classes, which could cause problems.
Switch to only use ST4, as the normal recursive dependency brings in.
 2015-04-08 23:12:37 -04:00
Robert Stupp 4fd6c969d0 Merge branch 'cassandra-2.1' into trunk 2015-04-07 18:17:22 +02:00
Robert Stupp 2641424247 Add generate-idea-files target to build.xml 
Patch by Robert Stupp; Reviewed by T Jake Luciani for CASSANDRA-9123
 2015-04-07 18:12:16 +02:00
T Jake Luciani 150f827364 Merge branch 'cassandra-2.1.4-build' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	NEWS.txt
 2015-04-01 10:56:05 -04:00
T Jake Luciani c041ea8b37 Bind JMX to localhost unless explicitly configured otherwise 2015-03-30 09:38:50 -04:00
Dave Brosius d772f6f84e fix artifact name or reporter-config3 2015-03-28 11:30:57 -04:00
blambov 44f8254df8 Compressed Commit Log 
patch by branimir; reviewed by ariel for CASSANDRA-6809
 2015-03-24 23:42:30 +00:00
T Jake Luciani a672097db4 bump metrics-reporter-config dependency 
patch by tjake; reviewed by cburroughs for CASSANDRA-8149
 2015-03-23 13:44:30 -04:00
Dave Brosius da8268f156 Suppress warning: 'DirectBuffer is internal proprietary API and may be removed in a future release' 2015-03-17 23:15:22 -04:00
Brandon Williams db1cf3e084 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2015-03-17 14:34:59 -05:00
Brandon Williams 77d58f900e Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2015-03-17 14:34:26 -05:00
Brandon Williams b2aa67ea29 Allow specifying the tmp dir 
Patch by mshuler, reviewed by brandonwilliams for CASSANDRA-7712
 2015-03-17 14:33:27 -05:00
Dave Brosius d182fa1b41 make joda-time a proper pom dependency of cassandra 2015-03-16 23:02:35 -04:00
T Jake Luciani 31a182876e bump versions 2015-03-16 11:48:11 -04:00
T Jake Luciani 66a5d3bbe4 Make CRC32Ex into a separate maven dependency 
Patch by tjake; reviewed by aweisberg for CASSANDRA-8836
 2015-03-09 10:10:53 -04:00
Robert Stupp 0d2ec11c7e use preloaded jemalloc w/ Unsafe 
Patch by Robert Stupp; Reviewed by Ariel Weisberg for CASSANDRA-8714
 2015-03-05 10:57:03 +01:00
Brandon Williams 847f413ead Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
 2015-02-26 09:50:58 -08:00
Brandon Williams 322e8f0595 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-02-26 09:48:50 -08:00
Brandon Williams 98502e0c3f add comment about using testsome target 2015-02-26 09:48:40 -08:00
T Jake Luciani 9fdbb6559d fix bad merge 2015-02-20 12:38:28 -05:00
T Jake Luciani ea3ff25a0c Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
 2015-02-20 11:37:55 -05:00
T Jake Luciani 407b5de67c Upgrade java-driver used by cassandra-stress 
patch by tjake; reviewed by benedict for CASSANDRA-8842
 2015-02-20 11:32:59 -05:00
Benedict Elliott Smith 3e43ea46e8 fix merges 2015-02-19 14:29:14 +00:00
Benedict Elliott Smith dfd695c14b Select optimal CRC32 implementation at runtime 
patch by ariel; reviewed by benedict for CASSANDRA-8614
 2015-02-19 12:24:59 +00:00
T Jake Luciani caba0a5920 docs and bump version 2015-02-05 11:11:14 -05:00
Robert Stupp 97d7d139f2 row cache: remove annoying classpath from "jemalloc not found" message 
Patch by Robert Stupp; Reviewed by Aleksey Yeschenko
 2015-01-31 18:47:02 +01:00
T Jake Luciani 0b324c5e55 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
 2015-01-30 12:02:42 -05:00
T Jake Luciani cdcf6461a3 Upgrade thrift to 0.9.2 
Patch by tjake; reviewed by Philip Thompson for CASSANDRA-8685
 2015-01-30 09:46:02 -05:00
T Jake Luciani 8896a70b01 Upgrade metrics library and remove depricated metrics 
Patch by tjake; reviewed by aleksey for CASSANDRA-5657
 2015-01-28 11:12:19 -05:00
Benedict Elliott Smith 9c4a776d20 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java
	src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
	src/java/org/apache/cassandra/service/ActiveRepairService.java
	src/java/org/apache/cassandra/streaming/StreamSession.java
	src/java/org/apache/cassandra/streaming/StreamTransferTask.java
	src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
	test/unit/org/apache/cassandra/SchemaLoader.java
	test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
	test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
	test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
 2015-01-28 15:19:58 +00:00
Benedict Elliott Smith c75ee4160c Safer Resource Management 
patch by benedict; review by marcuse for CASSANDRA-7705
 2015-01-28 14:46:16 +00:00
Dave Brosius 7fb99d93ff trunk is using 1.0.5.2 of snappy-java 2015-01-27 02:05:04 -05:00
Dave Brosius d4b23b0598 remove use of commons-logging in favor of jcl-over-slf4j 2015-01-22 21:40:32 -05:00
Dave Brosius 35783b9567 add Robert as developer 2015-01-21 22:26:54 -05:00
Dave Brosius 222ea95835 minor javadoc fixes 2015-01-21 21:40:21 -05:00
Robert Stupp dfd78d0e90 Serializing Row cache alternative, fully off heap 
Patch by Robert Stupp, reviewed by Ariel Weisberg for CASSANDRA-7438
 2015-01-21 20:50:35 +01:00
T Jake Luciani 3dd9c38a14 DirectByteBuffer compatible LZ4 methods 
Patch by Branimir Lambov; reviewed by tjake for CASSANDRA-7039
 2015-01-16 09:34:13 -05:00
T Jake Luciani 5b66997fa8 prep for 2.0.12 release 2015-01-09 15:21:49 -05:00
Yuki Morishita 395720c37a fix to run test 2014-11-24 18:57:50 -06: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
Robert Stupp b4d7f3bed0 Deal with conflicts between system functions and UDFs 
patch by Robert Stupp; reviewed by Benjamin Lerer for CASSANDRA-7813
 2014-11-14 18:20:29 +03:00
Dave Brosius c832a36f25 route sigar's use of log4j thru slf4j 2014-11-08 23:12:04 -05:00
Mikhail Stepura 203efd0221 Merge branch 'cassandra-2.1' into trunk 2014-11-07 13:46:10 -08:00
Mikhail Stepura 155eccd66e (Eclipse) Re-use test classes from an ant build 
patch by Mikhail Stepura; reviewed by T Jake Luciani for CASSANDRA-8277
 2014-11-07 13:45:36 -08:00
Jake Luciani aa6233aa19 Fix build 2014-11-05 21:04:55 -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
T Jake Luciani ee85a31f6f Merge branch 'cassandra-2.1' into trunk 2014-11-04 09:41:55 -05:00
Mikhail Stepura 0bc1ea385e Attach existing sources to "Referenced libraries" in Eclipse 
Patch by Mikhail Stepura; reviewed by tjake for CASSANDRA-8240
 2014-11-04 09:34:05 -05:00
Mikhail Stepura a6c58f8b2f Don't compile Thrift sources in Eclipse, use classes for an ant build 
patch by Mikhail Stepura; reviewed by tjake for CASSANDRA-8250
 2014-11-04 09:23:18 -05:00
Mikhail Stepura 02a20f70b0 Merge branch 'cassandra-2.1' into trunk 2014-11-03 14:46:20 -08:00
Mikhail Stepura a8072ae3be Add junitreport target. 
patch by Mikhail Stepura; reviewed by Brandon Williams and Michael Shuler for CASSANDRA-6482
 2014-11-03 14:45:46 -08:00
Jake Luciani 0368e97ee4 Extend Descriptor to include a format value and refactor reader/writer apis 
patch by tjake; reviewed by Marcus Eriksson for CASSANDRA-7443
 2014-10-23 11:10:55 -04:00
Sylvain Lebresne 02b83d9a8c Update versions for 2.0.11 2014-10-21 16:23:52 +02:00
T Jake Luciani c235603475 Integrate JMH into build system 
patch by tjake; reviewed by Jason Brown for CASSANDRA-8151
 2014-10-21 09:57:12 -04:00
Brandon Williams 3ef8920014 bump base version to 3.0 2014-10-14 15:19:37 -05:00
Robert Stupp b94c87a181 Update java driver to 2.1.2 
patch by snazy; reviewed by slebresne for CASSANDRA-7692
 2014-10-14 09:49:25 +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
Jake Luciani a848b08ceb Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/transport/Server.java
 2014-10-08 16:34:35 -04:00
Jake Luciani dacddd2668 Upgrade netty to 4.0.23 enable epoll 
Patch by tjake; reviewed by Jason Brown for CASSANDRA-7761
 2014-10-08 16:12:30 -04:00
Dave Brosius 2279d49e96 Allow cassandra to compile under java 8 
patch by dbrosius reviewed by jmckenzie for cassandra-7028
 2014-10-02 12:47:08 -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
Jason Brown 916efcb6fb Merge branch 'cassandra-2.1' into trunk 2014-09-05 16:48:17 -07:00
Jason Brown 8d69214197 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	build.xml
 2014-09-05 16:45:20 -07:00
Pavel Yaskevich e6f307f4e5 bump thrift-server version to 0.3.7 to properly shutdown invocation pool shutdown 
patch by Pavel Yaskevich; tested by Philip Thompson for CASSANDRA-7594
 2014-09-05 14:23:24 -07:00
Robert Stupp 511129ddbd Accept Java source code for user-defined functions 
Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7562
 2014-09-03 14:37:15 -05:00
Jason Brown 936dea8952 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2014-09-03 10:48:50 -07:00
Jason Brown cae8715750 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	build.xml
	lib/thrift-server-0.3.5.jar
	lib/thrift-server-0.3.6.jar
 2014-09-03 10:45:52 -07:00
Pavel Yaskevich b22089d7c8 Make disruptor_thrift_server invocation pool configurable 
patch by Pavel Yaskevich; reviewed by Jason Brown for CASSANDRA-7594
 2014-09-02 16:14:27 -07:00
Sylvain Lebresne bc63083217 Merge branch 'cassandra-2.1' into trunk 2014-08-22 16:17:01 +02:00
Sylvain Lebresne 94f1107eca Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
 2014-08-22 16:16:46 +02:00
Sylvain Lebresne 8da134377a Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	build.xml
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
 2014-08-22 16:15:50 +02:00
Sylvain Lebresne 200b802884 Update java driver to 2.0.5 (for hadoop) 2014-08-22 16:11:44 +02:00
Sylvain Lebresne 9aea917b2c Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2014-08-18 10:23:20 +02:00
Sylvain Lebresne 5db108c314 Support list index operation with conditions 
patch by slebresne; reviewed by thobbs for CASSANDRA-7499
 2014-08-18 10:22:40 +02:00
Joshua McKenzie 048f72bd3e Merge branch 'cassandra-2.1' into trunk 2014-08-13 17:12:24 -05:00
Joshua McKenzie 74e7f28f7f fix generate-eclipse-files build.xml target on JDK 8 
Patch by Robert Stupp, reviewed by Josh McKenzie for CASSANDRA-7430
 2014-08-13 17:10:23 -05:00
Joshua McKenzie 696acc9239 Merge branch 'cassandra-2.1' into trunk 2014-08-12 16:40:38 -05:00
Joshua McKenzie 54215a21f0 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-12 16:40:15 -05:00
Joshua McKenzie dc8b4e1118 build.xml - exclude *.ps1 from fixcrlf 
Patch by Robert Stupp; review by Joshua McKenzie for CASSANDRA-7690
 2014-08-12 16:37:20 -05:00
Aleksey Yeschenko 5205ce669f Merge branch 'cassandra-2.1' into trunk 2014-08-11 01:08:53 +03:00
Aleksey Yeschenko f2f2d47324 Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
 2014-08-11 01:07:32 +03:00
Sylvain Lebresne 74847893c8 Versions for 2.1.0-rc6 2014-08-09 13:47:44 +02:00
Robert Stupp 25411bf1d1 Support pure user-defined functions 
Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7395
 2014-08-08 14:11:01 -05:00
Sylvain Lebresne 2f25e6e6ea Merge branch 'cassandra-2.1' into trunk 2014-08-08 12:51:12 +02:00
Sylvain Lebresne 8aed4196d2 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-08 12:50: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
Aleksey Yeschenko 59123b6f7d Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
 2014-08-07 00:51:07 +03:00
Aleksey Yeschenko 6beb13f19c Synchronise build.xml developers list with ASF C* committers 
See https://people.apache.org/committers-by-project.html#cassandra and
https://wiki.apache.org/cassandra/Committers
 2014-08-07 00:48:23 +03:00
Benedict Elliott Smith efe57f2306 Merge branch 'cassandra-2.1' into trunk 2014-08-05 15:22:21 +01:00
Benedict Elliott Smith 6a8d978f39 ninja add benedict to committers 2014-08-05 15:22:11 +01:00
Sylvain Lebresne cc3bd8bc98 Merge branch 'cassandra-2.1' into trunk 2014-08-05 10:22:32 +02:00
Sylvain Lebresne e6602f7639 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-05 10:22:07 +02:00
Sylvain Lebresne 95d289b849 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
	build.xml
 2014-08-05 10:21:48 +02:00
Sylvain Lebresne 5151fd5bcc Update java driver to 2.0.4 (for hadoop) 
patch by alexliu68; reviewed by slebresne for CASSANDRA-7618
 2014-08-05 10:18:58 +02:00
Dave Brosius d6f3cdf6ff Merge branch 'cassandra-2.1' into trunk 2014-08-03 00:45:48 -04:00
Dave Brosius 8d06dd102d Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-03 00:39:59 -04:00
Sylvain Lebresne cfb335e39b Update versions for 2.1.0-rc5 release 2014-08-02 13:48:00 +02:00
Brandon Williams 1e2a5b0ee3 Pig support for hadoop CqlInputFormat 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6454
 2014-07-23 10:26:50 -05:00
Brandon Williams 2093270c7c Merge branch 'cassandra-2.1' into trunk 2014-07-21 07:51:21 -05:00
Brandon Williams 3b14f6a5db Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-07-21 07:51:10 -05:00
Eric Evans d872e2c746 update versioning for 2.1.0-rc4 release 2014-07-18 13:42:11 -05:00
Jonathan Ellis 5dfee585dd fix build on os x 2014-07-17 15:57:30 -05:00
Brandon Williams 15ced94287 Merge branch 'cassandra-2.1' into trunk 2014-07-09 11:58:27 -05:00
Brandon Williams 40fd7f0120 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-09 11:58:15 -05:00
Brandon Williams 0b8fb5bb92 fix missing test build dep for pig-test 2014-07-09 11:50:49 -05:00
Aleksey Yeschenko 111f0c0f91 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	debian/changelog
 2014-07-08 20:21:26 +03:00
Aleksey Yeschenko 04944f0ca9 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-08 20:18:24 +03:00
Sylvain Lebresne 0bc98414ce Update versions and licenses for 2.1 RC3 release 2014-07-08 14:07:17 +02:00
Sylvain Lebresne 5b7798cd5e Merge branch 'cassandra-2.1' into trunk 2014-07-01 15:41:26 +02:00
Sylvain Lebresne 277475837f Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-01 15:40:20 +02:00
Sylvain Lebresne fcd3cc0eb6 Make sure cql-test only run CQLTester ones 2014-07-01 15:38:51 +02:00
Benedict Elliott Smith 51cdeed483 Merge branch 'cassandra-2.1' into trunk 2014-06-30 14:31:52 +01:00
Benedict Elliott Smith e77ea12520 Optimise CellName/Composite comparisons for NativeCell 
patch by Jake Luciani and Benedict Elliott Smith for CASSANDRA-6755
 2014-06-30 14:30:55 +01:00