Commit Graph

19238 Commits

Author SHA1 Message Date
Stefania Alborghetti 32112d80e2 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-29 08:17:43 +08:00
Stefania Alborghetti 38e973d08f Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-29 08:17:21 +08:00
Michael Shuler 86c5a00c23 deb package migration to dh_python2, added missing debian rules
Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853
2016-04-29 08:16:02 +08:00
Benjamin Lerer 7927ace3ea Merge branch cassandra-2.2 into cassandra-3.0 2016-04-28 11:13:18 +02:00
Alex Petrov c8d955533b Fix slice queries on ordered COMPACT tables
patch by Alex Petrov; reviewed by Benjamin Lerer for CASSANDRA-10988
2016-04-28 11:01:58 +02:00
Stefania Alborghetti b360653fcf Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-28 09:18:07 +08:00
Alex Petrov 88f22b9692 JSON datetime formatting needs timezone (backported from trunk)
patch by Alex Petrov; reviewed by Stefania Alborghetti for CASSANDRA-11137
2016-04-28 09:10:18 +08: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
Aleksey Yeschenko 3079ae60d2 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-27 17:57:59 +01:00
Aleksey Yeschenko e5c4027800 Fix is_dense recalculation for Thrift-updated tables
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-11502
2016-04-27 17:47:29 +01:00
Marcus Eriksson 8bfe09f466 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-27 10:10:42 +02:00
Marcus Eriksson 3db30aab98 Remove unnecessary file existence check during anticompaction.
Patch by marcuse; reviewed by Paulo Motta for CASSANDRA-11660
2016-04-27 10:03:42 +02:00
Stefania Alborghetti f2afd04e73 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-27 09:09:10 +08:00
Stefania Alborghetti b6b2517700 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-27 09:07:48 +08:00
Stefania Alborghetti 72057c6971 cqlsh COPY FROM fails for null values with non-prepared statements
patch by Stefania Alborghetti and Robert Stupp; reviewed by Robert Stupp for CASSANDRA-11631
2016-04-27 09:05:48 +08:00
Stefania Alborghetti fae7bf9c22 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-27 08:45:14 +08:00
Stefania Alborghetti 2dbcb5dae1 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-27 08:44:04 +08:00
Stefania Alborghetti b25139f8ac Make cython optional in pylib/setup.py
patch by Stefania Alborghetti; reviewed by tjake for CASSANDRA-11630
2016-04-27 08:42:32 +08:00
T Jake Luciani 5d37fc4c4e Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-26 13:13:42 -04:00
T Jake Luciani cfc398e818 Add missing tools to debian package
Patch by tjake and Michael Shuler; reviewed by Michael Shuler for CASSANDRA-11642
2016-04-26 13:08:03 -04:00
T Jake Luciani d87921c56d Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-26 12:49:38 -04:00
T Jake Luciani 487c8f79de Fix typo 2016-04-26 12:49:23 -04:00
T Jake Luciani 8d69cabd5a deb package migration to dh_python2
Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853
2016-04-26 12:29:06 -04:00
T Jake Luciani aea8e082f9 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-26 12:28:23 -04:00
T Jake Luciani ec1772ad87 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-26 12:18:10 -04:00
T Jake Luciani ae03066f4c deb package migration to dh_python2
Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853
2016-04-26 12:13:48 -04:00
T Jake Luciani fb20023fb5 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-26 12:11:15 -04:00
T Jake Luciani 26e0a33faf deb package migration to dh_python2
Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853
2016-04-26 12:06:46 -04:00
Yuki Morishita 049d70c2e6 Fix sstabledump not showing cells after tombstone marker
patch by yukim; reviewed by clohfink for CASSANDRA-11654
2016-04-26 08:06:56 -05:00
Marcus Eriksson bf7d4334ed Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-26 08:28:33 +02:00
Marcus Eriksson 3128802a5f Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-26 08:25:45 +02:00
Paulo Motta cc75de6912 Validate levels when building LeveledScanner to avoid overlaps with orphaned sstables
Patch by Paulo Motta; reviewed by marcuse for CASSANDRA-9935
2016-04-26 08:21:05 +02:00
Yuki Morishita 251449ffad Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-25 20:08:24 -05:00
Yuki Morishita 1d7c0bc210 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-25 20:05:06 -05:00
Wei Deng c43cf8d79b Change order of directory searching for cassandra.in.sh
patch by Wei Deng; reviewed by yukim for CASSANDRA-11628
2016-04-25 20:03:27 -05:00
Robert Stupp c9285d0e30 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-25 10:21:25 +02:00
Robert Stupp 5f99629a37 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-25 10:18:16 +02:00
Robert Stupp 07c9fa2cac cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values
patch by Robert Stupp; reviewed by Stefania for CASSANDRA-11633
2016-04-25 10:16:28 +02:00
Stefania Alborghetti f050133f20 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-22 09:44:19 +08:00
Stefania Alborghetti 7713c821ca Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-22 09:42:57 +08:00
Stefania Alborghetti 666bee6125 clqsh: COPY FROM throws TypeError with Cython extensions enabled
patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-11574
2016-04-22 09:42:06 +08:00
Tyler Hobbs a4e1182816 Filter out all LocalStrat keyspaces for streaming
Patch by Tyler Hobbs; reviewed by Blake Eggleston for CASSANDRA-11627
2016-04-21 16:15:50 -05:00
Tyler Hobbs d8d920dce9 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-21 15:32:51 -05:00
Tyler Hobbs c42f5f6853 Ninja: use logger.trace() when we only intend to log at trace 2016-04-21 15:31:40 -05:00
Sam Tunnicliffe caae9870dd Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-21 18:42:43 +01:00
Alex Petrov 3244774572 Avoid possible stack overflow in ModificationStatement::getFunctions
Patch by Alex Petrov; reviewed by Sam Tunnicliffe for CASSANDRA-11621
2016-04-21 18:41:43 +01:00
Stefania Alborghetti bb68078e7c Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-21 10:17:50 +08:00
Stefania Alborghetti b80ff541e2 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-21 10:12:24 +08:00
Stefania Alborghetti c8914c0725 cqlsh: COPY FROM ignores NULL values in conversion
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11549
2016-04-21 10:10:37 +08:00
Stefania Alborghetti c568efee54 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-21 09:45:49 +08:00