Commit Graph

1111 Commits

Author SHA1 Message Date
Marcus Eriksson d14a9266c7 Automatic sstable upgrades
Patch by marcuse; reviewed by Ariel Weisberg for CASSANDRA-14197
2018-05-09 08:17:33 +02:00
Blake Eggleston 54de771e64 Add network authz
Patch by Blake Eggleston; Reviewed by Sam Tunnicliffe for CASSANDRA-13985
2018-04-23 09:55:31 -07:00
Aleksey Yeshchenko 2fcd29b830 Eliminate background repair and probablistic read_repair_chance table options
patch by Aleksey Yeschenko; reviewed by Blake Eggleston for
CASSANDRA-13910
2018-04-18 11:41:17 +01:00
Gregory Ramsperger fd44a69fce Use standard Amazon naming for datacenter and rack in Ec2Snitch.
patch by Gregory Ramsperger and jasobrown; reviewed by Joey Lynch for CASSANDRA-7839
2018-04-16 17:59:06 -07:00
nvharikrishna 42827e6a67 Yaml comments: data_file_directories distributes data evenly by partitioning its token ranges.
Patch by Venkata Harikrishna Nukala; Reviewed by Jeff Jirsa for CASSANDRA-14372
2018-04-10 21:22:19 -07:00
Alex Ott 73fa27cc6a cqlshrc.sample uses incorrect option for time formatting
Closes #197

Patch by Alex Ott; Reviewed by Jeff Jirsa for CASSANDRA-14243
2018-03-01 23:16:24 -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
Stefan Podkowinski bb9aa09881 Use JRE default key store algorithm instead of SunX509
patch by Stefan Podkowinski; reviewed by Jason Brown for CASSANRA-13259
2018-02-14 11:29:59 +01:00
Paulo Motta 6034c268c3 Merge branch 'cassandra-3.11' into trunk 2018-02-10 15:03:59 -02:00
Paulo Motta 0a6b6f506b Merge branch 'cassandra-3.0' into cassandra-3.11 2018-02-10 14:59:28 -02:00
Paulo Motta c231ed5be0 Merge branch 'cassandra-2.2' into cassandra-3.0 2018-02-10 14:57:53 -02: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 d569c831cb Merge branch 'cassandra-3.11' into trunk 2017-12-13 19:53:42 -08:00
Jason Brown c000827afd Merge branch 'cassandra-3.0' into cassandra-3.11 2017-12-13 19:52:31 -08:00
Jason Brown db788fe860 Improve commit log chain marker updating
patch by jasobrown; reviewed by Ariel Weisberg for CASSANDRA-14108
2017-12-13 19:51:34 -08:00
Benjamin Lerer 17e602b7d2 Merge branch cassandra-3.11 into trunk 2017-12-12 10:52:23 +01:00
Benjamin Lerer a7c45be936 Merge branch cassandra-3.0 into cassandra-3.11 2017-12-12 10:42:50 +01:00
Benjamin Lerer dd187d105b Merge branch cassandra-2.2 into cassandra-3.0 2017-12-12 10:32:36 +01:00
Benjamin Lerer 02aba7343c Rely on the JVM to handle OutOfMemoryErrors
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-13006
2017-12-12 10:21:05 +01:00
Jason Brown 2402acd47e Merge branch 'cassandra-3.11' into trunk 2017-12-05 05:11:21 -08:00
Jason Brown c3a1a4fa80 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-12-05 05:08:22 -08:00
Jason Brown 05cb556f90 More frequent commitlog chained markers
patch by jasobrown; reviewed by Sam Tunnecliffe for CASSANDRA-13987
2017-12-05 05:06:38 -08: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
Yuji Ito f3f90c1896 Add GroupCommitLogService
patch by Yuji Ito and jasobrown; reviewed by Ariel Weisberg for CASSANDRA-13530
2017-12-01 13:12:20 -08:00
Andrés de la Peña 4c80eeece3 Parallelize initial materialized view build
patch by Andres de la Peña; reviewed by Paulo Motta for CASSANDRA-12245
2017-12-01 14:58:12 +01:00
Jason Brown 260846685b Node to Node encryption transitional mode
patch by jasobrown; reviewed by Stefan Podkowinski for CASSANDRA-10404
2017-11-03 05:06:38 -07:00
Jason Brown 87962dcf36 Merge branch 'cassandra-3.11' into trunk 2017-11-02 10:47:17 -07:00
Jason Brown c8a3b58bdb ninja-fix comment to correct the default RING_DEALY value 2017-11-02 10:46:24 -07:00
Blake Eggleston 569c6abcfa Merge branch 'cassandra-3.11' into trunk 2017-10-26 14:06:24 -07:00
Blake Eggleston ea443dfe3e Merge branch 'cassandra-3.0' into cassandra-3.11 2017-10-26 14:03:33 -07:00
Blake Eggleston b8697441d7 Add flag to disable materialized views, and warnings on creation
Patch by Blake Eggleston; Reviewed by Aleksey Yeschenko for CASSANDRA-13959
2017-10-26 13:54:37 -07:00
Zhao Yang a586f6c88d Improve config validation and documentation on overflow and NPE
patch by Zhao Yang; reviewed by Kurt Greaves for CASSANDRA-13622
2017-09-12 15:06:23 +01:00
Andrés de la Peña 1a679cf5b6 Merge branch 'cassandra-3.11' into trunk 2017-09-12 14:55:31 +01:00
Andrés de la Peña 12841938a0 Merge branch 'cassandra-3.0' into cassandra-3.11
# Conflicts:
#	CHANGES.txt
#	src/java/org/apache/cassandra/config/DatabaseDescriptor.java
2017-09-12 14:52:18 +01:00
Zhao Yang 8fc9275d30 Improve config validation and documentation on overflow and NPE
patch by Zhao Yang; reviewed by Kurt Greaves for CASSANDRA-13622
2017-09-12 14:31:07 +01:00
Jay Zhuang 41ef972b18 simplify mx4j configuration
patch by Jay Zhuang; reviewed by jasobrown for CASSANDRA-13578
2017-08-24 09:13:56 -07:00
Jason Brown d2dcd7f884 force minumum timeout value
patch by Varun Barala; reviewed by jasobrown for CASSANDRA-9375
2017-08-23 15:08:11 -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
Tomas Repik 12d4e2f189 Change default start_native_transport to true and remove from jvm.options
patch by Tomas Repik; reviewed by Stefan Podkowinski for CASSANDRA-13656
2017-07-20 09:43:02 +02:00
Joaquin Casares 082af0a9ba Remove unused max_value_size_in_mb config setting
Fixes #124

Patch by Joaquin Casares; Reviewed by Jeff Jirsa for CASSANDRA-13625
2017-06-21 16:58:03 -07:00
Blake Eggleston 8028d4bdd6 Add configurable upper bound for validation executor threads
Patch by Blake Eggleston; Reviewed by Jeff Jirsa for CASSANDRA-13521
2017-05-18 16:15:33 -07:00
Blake Eggleston f8159ac507 Bring back maxHintTTL propery
Patch by Blake Eggleston, reviewed by Aleksey Yeschenko for CASSANDRA-12982
2017-05-16 14:37:33 -07:00
Ariel Weisberg ed4a7c5ebf Merge branch 'cassandra-3.11' into trunk 2017-05-03 16:38:27 -04:00
Ariel Weisberg 187658861d Merge branch 'cassandra-3.0' into cassandra-3.11 2017-05-03 16:34:56 -04:00
Christian Esken 617c8ebadb Expire OTC messages by a single Thread
patch by Christian Esken; reviewed by Ariel Weisberg for CASSANDRA-13265
2017-05-03 16:30:43 -04:00
Edward Capriolo 1096f9f5e7 Make gc_log and gc_warn settable at runtime
Patch by Edward Capriolo; reviewed by Jon Haddad for CASSANDRA-12661
2017-04-11 17:14:11 -07:00
Ariel Weisberg 6f647aaa0d Make it possible to monitor an ideal consistency level separate from actual consistency level
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13289
2017-03-30 17:01:20 -04:00
Jeff Jirsa a49cf2c6cc Merge branch 'cassandra-3.11' into trunk 2017-03-02 21:38:14 -08:00
Jeff Jirsa ff170af2a2 Supplemental Ninja: Address message coalescing regression - Update yaml
Patch by Jeff Jirsa following CASSANDRA-12676
2017-03-02 21:36:34 -08:00
Brad Vernon 873660cf58 Remove offheap_buffer as option for memtable_allocation_type in cassandra.yaml
patch by Brad Vernon; reviewed by Robert Stupp for CASSANDRA-13179
2017-03-01 11:05:33 +01:00
Ariel Weisberg 48bfc8e8dc Merge branch 'cassandra-3.11' into trunk 2017-02-14 15:14:15 -05:00
Ariel Weisberg 23a1dee45f Merge branch 'cassandra-3.0' into cassandra-3.11 2017-02-14 15:13:39 -05:00
Ariel Weisberg 82943d6aa7 Merge branch 'cassandra-2.2' into cassandra-3.0 2017-02-14 15:12:39 -05:00
Ariel Weisberg 9a80f803c2 Remove non-ascii characters from cassandra.yaml introduced by CASSANDRA-13090
patch by Ariel Weisberg; reviewed by Jason Brown for CASSANDRA-13219
2017-02-14 15:09:20 -05:00
Ariel Weisberg edcbef3e34 Merge branch 'cassandra-3.11' into trunk 2017-02-13 13:34:31 -05:00
Ariel Weisberg 702ec088f5 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-02-13 13:32:30 -05:00
Ariel Weisberg 3d01e90615 Merge branch 'cassandra-2.2' into cassandra-3.0 2017-02-13 13:23:39 -05:00
Corentin Chary 5725e2c422 Coalescing strategies improvements CASSANDRA-13090
With the previous code TIMEHORIZON and MOVINGAVERAGE
coalesing strategy would wait even when the backlog
still contains data which would make it grow even more.

Also:
- cleanups parkLoop()
- add otc_coalescing_max_coalesced_messages
- add otc_coalescing_enough_coalesced_messages
- add other otc_* settings to cassandra.yaml

patch by Corentin Chary <c.chary@criteo.com> reviewed by Ariel Weisberg <aweisberg@apple.com> for CASSANDRA-13090
2017-02-13 12:58:29 -05:00
Corentin Chary 4d67639d38 Parallelize streaming of different keyspaces for bootstrap and rebuild
patch by Corentin Chary; reviewed by jasobrown for CASSANDRA-4663
2017-01-20 11:47:18 -08:00
Benjamin Lerer 05106f0780 Merge branch cassandra-3.X into trunk 2017-01-11 21:31:07 +01:00
Benjamin Lerer 3bcdbd66fe Merge branch cassandra-3.11 into cassandra-3.X 2017-01-11 21:29:55 +01:00
Benjamin Lerer 9c2ab25556 Merge branch cassandra-3.0 into cassandra-3.11 2017-01-11 21:28:21 +01:00
Benjamin Lerer 5774d8e235 Removes SetJsr223Env from cassandra-env.ps1 (Follow up CASSANDRA-12883) 2017-01-11 21:23:48 +01:00
Paulo Motta a1f0dcdcb7 Merge branch 'cassandra-3.X' into trunk 2017-01-06 11:00:12 -02:00
Paulo Motta 2e675b5ca3 ninja2: fix thread priorities workaround url on jvm.options 2017-01-06 10:59:53 -02:00
Paulo Motta 44d2b80098 ninja: fix thread priorities workaround url on jvm.options 2017-01-06 09:54:37 -02:00
Paulo Motta 29a855e1ba Merge branch 'cassandra-3.X' into trunk 2017-01-06 09:53:09 -02:00
Paulo Motta 5c0aacbacd ninja: fix thread priorities workaround url on jvm.options 2017-01-06 09:52:22 -02:00
Sam Tunnicliffe b02dec3da5 Merge branch 'cassandra-3.X' into trunk 2016-12-13 10:32:57 +00:00
Sam Tunnicliffe 8bbe2f5951 Merge branch 'cassandra-3.0' into cassandra-3.11 2016-12-13 10:29:08 +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
Sam Tunnicliffe 2f3e07a0ad Merge branch 'cassandra-3.0' into cassandra-3.X 2016-11-14 12:49:04 +00:00
Eduard Tudenhoefner d5326866d3 Use correct system_auth table names in cassandra.yaml
Patch by Eduard Tudenhoefner; reviewed by Sam Tunnicliffe for
CASSANDRA-12911
2016-11-14 12:48:06 +00:00
Guy Bolton King e722046406 Update cassandra.yaml documentation for batch_size thresholds
Take account of changes in CASSANDRA-10876

Patch by Guy Bolton King; reviewed by Joel Knighton for CASSANDRA-12761
2016-10-14 17:14:57 +01:00
Stefania Alborghetti 2e18adf257 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-04 09:54:18 +08:00
Alex Petrov 5115c106db Unify drain and shutdown processes
Patch by Alex Petrov; reviewed by Stefania Alborghetti for CASSANDRA-12509
2016-10-04 09:51:51 +08:00
Edward Capriolo f92f959eb3 CASSANDRA-12688 strongly suggest leaving -ea on 2016-09-22 10:39:47 -07:00
Sergio Bossa d43b9ce509 Support optional backpressure strategies at the coordinator
patch by Sergio Bossa; reviewed by Stefania Alborghetti for CASSANDRA-9318
2016-09-20 09:07:36 +08:00
Paulo Motta 8af61ac311 Add keep-alive to streaming
patch by Paulo Motta; reviewed by Yuki Morishita for CASSANDRA-11841
2016-08-31 16:03:00 -05:00
Shogo Hoshii 6966fcda9b Added slow query log
patch by Shogo Hoshii and Stefania Alborghetti; reviewed by Tyler Hobbs
and Stefania Alborghetti for CASSANDRA-12403
2016-08-17 10:47:14 +08:00
Ariel Weisberg 6dfc1e7eeb Deprecate memtable_cleanup_threshold and set memtable_flush_writers default to 2.
Patch by Ariel Weisberg; reviewed by marcuse for CASSANDRA-12228
2016-08-04 14:30:04 +02:00
Josh McKenzie 503148b3d4 Merge branch 'cassandra-3.9' into trunk 2016-07-27 12:16:30 -04:00
Josh McKenzie d22e3908b6 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-27 12:16:23 -04:00
Paulo Motta d6232e04d7 Add missing options to cassandra-env.ps1
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10939
2016-07-27 12:15:31 -04:00
Paulo Motta 01d5fa8acf Fix Java Version check for versions > 100 on Windows (3.0 patch)
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-12278
2016-07-27 11:41:17 -04:00
Josh McKenzie 6284b6dcce Merge branch 'cassandra-3.9' into trunk 2016-07-27 11:40:09 -04:00
Paulo Motta 247a56bca7 Fix Java Version check for versions > 100 on Windows
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-12278
2016-07-27 11:39:28 -04:00
Jérôme Mainaud e1393ec54f Unify STDOUT and SYSTEMLOG logback format
Patch by Jérôme Mainaud; Reviewed by Paulo Motta for CASSANDRA-12004
2016-07-27 15:38:32 +01:00
T Jake Luciani dc9ed46341 Improve write path performance
Patch by tjake; reviewed by Stefania Alborghetti for CASSANDRA-12269
2016-07-26 14:55:54 -04:00
Jonathan Ellis 16086998e1 update cassandra.yaml comments post-CASSANDRA-10243 2016-07-26 10:58:44 -05:00
Jonathan Ellis addf9c2c8e Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-26 10:58:13 -05:00
Jonathan Ellis 023d2e98f1 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-26 10:54:55 -05:00
Jonathan Ellis 04ef62cba2 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-07-26 10:54:43 -05:00
Jonathan Ellis 48a45eda50 update cassandra.yaml comments post-CASSANDRA-10243 2016-07-26 10:54:31 -05:00
Sam Tunnicliffe 9eae8d340c Use custom RMI registry to avoid issues with JMX and SSL
Patch by Sam Tunnicliffe; reviewed by Jake Luciani for CASSANDRA-12109
2016-07-20 13:06:02 +01:00
Josh McKenzie 76188e9520 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-11 16:29:58 -04:00
Josh McKenzie e99ee19950 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-11 16:28:22 -04:00
Jeff Jirsa f0d1d75ebf Make GCInspector min log duration configurable
Patch by jjirsa; reviewed by jmckenzie for CASSANDRA-11715
2016-07-11 16:27:04 -04:00
Stefania Alborghetti 78f077de07 Revert "Update to Netty 4.0.37"
This reverts commit e8d7fe8a28.
2016-07-06 12:58:06 +08:00
Josh McKenzie c86b3e1830 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-06-30 16:33:53 -04:00
Josh McKenzie 6b241097b4 revert CASSANDRA-11949 3.0+ 2016-06-30 16:33:34 -04:00
Josh McKenzie 82cdc8617a Revert "Fix GC logging on first start"
This reverts commit 3a61c10659.
2016-06-30 16:31:43 -04:00
Josh McKenzie 8f5b8db589 Revert "Ninja: suppress printed output on dir creation in Win32 startup"
This reverts commit 3041034fb9.
2016-06-30 16:31:32 -04:00
Josh McKenzie 1d9d56659e Merge branch 'cassandra-3.0' into cassandra-3.9 2016-06-30 13:36:33 -04:00
Josh McKenzie 1991fea8bf Merge branch 'cassandra-2.2' into cassandra-3.0 2016-06-30 13:36:17 -04:00
Josh McKenzie 3041034fb9 Ninja: suppress printed output on dir creation in Win32 startup 2016-06-30 13:35:20 -04:00
Josh McKenzie 0294fd8911 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-06-28 13:47:49 -04:00
Josh McKenzie 2395f9e467 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-06-28 13:47:24 -04:00
Mahdi Mohammadi 3a61c10659 Fix GC logging on first start
Patch by mmohammadi; reviewed by jmckenzie for CASSANDRA-11949
2016-06-28 13:46:38 -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
Tyler Hobbs f2f3071443 Automatically generate docs for cassandra.yaml 2016-06-21 19:53:48 +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
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
Josh McKenzie 60e5e0ef4c Merge branch 'cassandra-3.0' into trunk 2016-06-14 11:13:42 -04:00
Josh McKenzie 3c531cbec9 Fix example metrics
Patch by cbate; reviewed by jmckenzie for CASSANDRA-11481
2016-06-14 11:13:31 -04:00
Stefania Alborghetti 68d20edb2b Merge branch 'cassandra-3.0' into cassandra-3.7 2016-05-26 10:52:31 +08:00
Alex Petrov 85cc390189 Prevent OOM failures on SSTable corruption, improve tests for corruption detection
Patch by Alex Petrov; reviewed by Stefania Alborghetti for CASSANDRA-9530
2016-05-26 10:51:06 +08:00
Yuki Morishita f39a352fdf Merge branch 'cassandra-3.0' into cassandra-3.7 2016-05-25 19:35:20 -05:00
Yuki Morishita e000ebbe50 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-05-25 19:30:52 -05:00
Yuki Morishita 2bacc9a5c7 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-05-25 19:28:01 -05:00
Paulo Motta d27f9b0b77 Set default streaming_socket_timeout_in_ms to 24 hours
Patch by Paulo Motta; reviewed by Yuki Morishita for CASSANDRA-11840
2016-05-25 19:26:51 -05:00
Josh McKenzie 54d7fc4b02 Merge branch 'cassandra-3.0' into cassandra-3.7 2016-05-03 14:06:57 -04:00
Josh McKenzie c7d216e3fe Merge branch 'cassandra-2.2' into cassandra-3.0 2016-05-03 14:06:18 -04:00
Josh McKenzie 8bf453a449 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-05-03 14:05:23 -04:00
Eduard Tudenhoefner 5202147d9f Use -lt comparator for JVM patch version
Patch by etudenhoefner; reviewed by mshuler for CASSANDRA-11661
2016-05-03 14:04:16 -04:00
Robert Stupp 9581209b35 Make prepared statement cache size configurable
patch by Robert Stupp; reviewed by Benjamin Lerer for CASSANDRA-11555
2016-05-02 17:03:56 +02:00
Sam Tunnicliffe 7b0c7164aa Integrated JMX Authentication and Authorization
Patch by Jan Karlsson and Sam Tunnicliffe; reviewed by Jake Luciani for
CASSANDRA-10091
2016-05-02 11:44:48 +01:00
Branimir Lambov 30bb255ec9 Add uncompressed chunk cache for RandomAccessReader
patch by Branimir Lambov; reviewed by Pavel Yaskevich for CASSANDRA-5863
2016-04-28 22:14:42 -07:00
Aleksey Yeschenko 4254de17f4 Merge branch 'cassandra-3.0' into trunk 2016-04-27 18:26:22 +01:00
Blake Eggleston 7a2be8fa4a Don't require HEAP_NEW_SIZE to be set when using G1
patch by Blake Eggleston; reviewed by Paulo Motta for CASSANDRA-11600
2016-04-27 18:25:04 +01:00
Robert Stupp ef5bbedd68 Support large partitions on the 3.0 sstable format
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-11206
2016-04-21 16:48:26 +02:00
Aleksey Yeschenko cb1a63474d Merge branch 'cassandra-3.0' into trunk 2016-04-11 19:18:42 +01:00
Aleksey Yeschenko 5dbeef3f51 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-11 19:16:39 +01:00
Aleksey Yeschenko ab2b8a60c4 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-11 19:15:47 +01:00
Stefania Alborghetti c1b1d3bccf Checking if an unlogged batch is local is inefficient
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11529
2016-04-11 19:12:25 +01:00
Josh McKenzie bd633377a9 Merge branch 'cassandra-3.0' into trunk 2016-04-06 18:57:43 -04:00
Josh McKenzie 04a75a6344 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-06 18:45:09 -04:00
Josh McKenzie 96c53e0a5e Fix launch with whitespace in path on Windows
Patch by jmckenzie; reviewed by pmotta for CASSANDRA-11515
2016-04-06 18:37:08 -04:00
Tyler Hobbs 3efcdc5f45 Merge branch 'cassandra-3.5' into trunk 2016-04-01 12:36:42 -05:00
Tyler Hobbs 496418ce07 Merge branch 'cassandra-3.0' into cassandra-3.5
Conflicts:
	CHANGES.txt
	pylib/cqlshlib/copyutil.py
2016-04-01 12:32:01 -05:00
Stefania Alborghetti 98086b65d0 cqlsh: Improve backoff policy for COPY FROM
Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for
CASSANDRA-11320
2016-04-01 12:29:01 -05:00
Kaide Mu 761dfc2c83 Compress only inter-dc traffic by default
patch by Kaide Mu; reviewed by Paulo Motta for CASSANDRA-8888
2016-03-29 17:51:58 +01:00
Stefan Podkowinski c9c9c42263 Hostname verification for node-to-node encryption
patch by Stefan Podkowinski; reviewed by Robert Stupp for CASSANDRA-9220
2016-03-28 13:02:50 +02:00
Stefania Alborghetti 1ad9d55675 COPY TO should have higher double precision
patch by Stefania; reviewed by slebresne for CASSANDRA-11255
2016-03-18 10:56:49 +01:00
Stefan Podkowinski e4a0a4bf65 Remove hard-coded SSL cipher suites and protocols
patch by Stefan Podkowinski; reviewed by Robert Stupp for CASSANDRA-10508
2016-03-16 20:36:44 +01:00
Yuki Morishita 9d527ed257 Merge branch 'cassandra-3.5' into trunk 2016-03-10 13:03:21 -06:00
Yuki Morishita 10d61d46d3 Merge branch 'cassandra-3.0' into cassandra-3.5 2016-03-10 13:03:15 -06:00
Yuki Morishita c9d2b7addc Merge branch 'cassandra-2.2' into cassandra-3.0 2016-03-10 13:01:30 -06:00
Yuki Morishita b9ff7fe137 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-03-10 13:00:09 -06:00