[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-09-12 Thread adelapena 
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a679cf5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a679cf5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a679cf5

Branch: refs/heads/trunk
Commit: 1a679cf5b612410d72fc69918617aad258821e4c
Parents: 826c9f4 1284193
Author: Andrés de la Peña 
Authored: Tue Sep 12 14:55:31 2017 +0100
Committer: Andrés de la Peña 
Committed: Tue Sep 12 14:55:31 2017 +0100

--
 CHANGES.txt  |  1 +
 conf/cassandra.yaml  |  5 +++--
 .../apache/cassandra/config/DatabaseDescriptor.java  | 15 +++
 src/java/org/apache/cassandra/utils/FBUtilities.java |  7 +--
 4 files changed, 24 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a679cf5/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a679cf5/conf/cassandra.yaml
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a679cf5/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a679cf5/src/java/org/apache/cassandra/utils/FBUtilities.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-09-12 Thread adelapena 
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37771f31
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37771f31
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37771f31

Branch: refs/heads/trunk
Commit: 37771f31bcc35747fff350f1ec7a4a7e312f19dd
Parents: 1a679cf c05d98a
Author: Andrés de la Peña 
Authored: Tue Sep 12 15:29:55 2017 +0100
Committer: Andrés de la Peña 
Committed: Tue Sep 12 15:29:55 2017 +0100

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/37771f31/CHANGES.txt
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-04-07 Thread ifesdjeen 
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1cb8e5a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1cb8e5a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1cb8e5a

Branch: refs/heads/trunk
Commit: a1cb8e5abc224623c35fe84969dc08894c91278a
Parents: 94aa57e 863ad11
Author: Alex Petrov 
Authored: Fri Apr 7 12:20:02 2017 +0200
Committer: Alex Petrov 
Committed: Fri Apr 7 12:20:02 2017 +0200

--
 CHANGES.txt |  1 +
 .../db/SinglePartitionReadCommand.java  | 11 +--
 .../db/filter/ClusteringIndexNamesFilter.java   |  6 +-
 .../db/partitions/AbstractBTreePartition.java   |  5 --
 .../cassandra/utils/IndexedSearchIterator.java  |  5 ++
 .../apache/cassandra/utils/SearchIterator.java  |  2 -
 .../cassandra/utils/memory/EnsureOnHeap.java|  5 --
 .../cql3/validation/operations/DeleteTest.java  | 82 +++-
 .../partition/PartitionImplementationTest.java  |  2 +-
 9 files changed, 92 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1cb8e5a/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1cb8e5a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
index 1de02a9,1358f29..d5d2901
--- a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
+++ b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
@@@ -744,13 -778,13 +744,13 @@@ public class SinglePartitionReadComman
  
  // We need to get the partition deletion and include it if 
it's live. In any case though, we're done with that sstable.
  sstable.incrementReadCount();
- try (UnfilteredRowIterator iter = 
StorageHook.instance.makeRowIterator(cfs, sstable, partitionKey(), Slices.ALL, 
columnFilter(), filter.isReversed()))
 -try (UnfilteredRowIterator iter = 
StorageHook.instance.makeRowIterator(cfs, sstable, partitionKey(), 
filter.getSlices(metadata()), columnFilter(), filter.isReversed(), 
isForThrift()))
++try (UnfilteredRowIterator iter = 
StorageHook.instance.makeRowIterator(cfs, sstable, partitionKey(), 
filter.getSlices(metadata()), columnFilter(), filter.isReversed()))
  {
+ sstablesIterated++;
  if (!iter.partitionLevelDeletion().isLive())
- {
- sstablesIterated++;
  result = 
add(UnfilteredRowIterators.noRowsIterator(iter.metadata(), iter.partitionKey(), 
Rows.EMPTY_STATIC_ROW, iter.partitionLevelDeletion(), filter.isReversed()), 
result, filter, sstable.isRepaired());
- }
+ else
+ result = add(iter, result, filter, 
sstable.isRepaired());
  }
  continue;
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1cb8e5a/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
--
diff --cc 
src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
index 2f7c13a,31535fc..264e327
--- a/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
@@@ -136,20 -136,20 +136,20 @@@ public class ClusteringIndexNamesFilte
  
  public UnfilteredRowIterator getUnfilteredRowIterator(final ColumnFilter 
columnFilter, final Partition partition)
  {
+ final Iterator clusteringIter = 
clusteringsInQueryOrder.iterator();
  final SearchIterator searcher = 
partition.searchIterator(columnFilter, reversed);
+ 
  return new AbstractUnfilteredRowIterator(partition.metadata(),
 -partition.partitionKey(),
 -partition.partitionLevelDeletion(),
 -columnFilter.fetchedColumns(),
 -
searcher.next(Clustering.STATIC_CLUSTERING),
 -reversed,
 -partition.stats())
 + partition.partitionKey(),
 + 
partition.partitionLevelDeletion(),
 + 
columnFilter.fetchedColumns(),
 + 
searcher.next(Clustering.STAT

[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-05-11 Thread samt 
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c43371bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c43371bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c43371bf

Branch: refs/heads/trunk
Commit: c43371bf8fb7e1ec761a37a5f9938df9731fac4e
Parents: 6deafff 3a06433
Author: Sam Tunnicliffe 
Authored: Thu May 11 15:18:00 2017 +0100
Committer: Sam Tunnicliffe 
Committed: Thu May 11 15:18:00 2017 +0100

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-05-12 Thread yukim 
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dfb90b14
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dfb90b14
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dfb90b14

Branch: refs/heads/trunk
Commit: dfb90b1458ac6ee427f9e329b45c764a3a0a0c06
Parents: c66044f c2299e6
Author: Yuki Morishita 
Authored: Fri May 12 16:00:10 2017 +0900
Committer: Yuki Morishita 
Committed: Fri May 12 16:00:10 2017 +0900

--
 CHANGES.txt |  1 +
 .../apache/cassandra/tools/LoaderOptions.java   | 26 ++--
 2 files changed, 19 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfb90b14/CHANGES.txt
--
diff --cc CHANGES.txt
index 889a3b2,9b31d48..b8b2b90
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -98,7 -33,9 +98,8 @@@
   * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
   * Tracing payload not passed from QueryMessage to tracing session 
(CASSANDRA-12835)
  Merged from 3.0:
+  * Add storage port options to sstableloader (CASSANDRA-13518)
   * Properly handle quoted index names in cqlsh DESCRIBE output 
(CASSANDRA-12847)
 - * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
   * Fix NPE in StorageService.excise() (CASSANDRA-13163)
   * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
   * Fail repair if insufficient responses received (CASSANDRA-13397)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-06-15 Thread mshuler 
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0eac526
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0eac526
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0eac526

Branch: refs/heads/trunk
Commit: e0eac52640cd407f3b3595704052a2d2b4f74b48
Parents: 32b6059 5ea7f7c
Author: Michael Shuler 
Authored: Thu Jun 15 14:09:20 2017 -0500
Committer: Michael Shuler 
Committed: Thu Jun 15 14:09:20 2017 -0500

--
 build.properties.default | 2 +-
 build.xml| 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0eac526/build.xml
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-02-09 Thread snazy 
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0811824a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0811824a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0811824a

Branch: refs/heads/trunk
Commit: 0811824abbf46182005c5c54cee7b08243f2057a
Parents: 4550734 6d5cd2d
Author: Robert Stupp 
Authored: Thu Feb 9 21:13:14 2017 +0100
Committer: Robert Stupp 
Committed: Thu Feb 9 21:13:14 2017 +0100

--
 CHANGES.txt |   2 +
 build.xml   |   2 +-
 lib/licenses/netty-all-4.0.39.Final.txt | 202 ---
 lib/licenses/netty-all-4.0.44.Final.txt | 202 +++
 lib/netty-all-4.0.39.Final.jar  | Bin 2271610 -> 0 bytes
 lib/netty-all-4.0.44.Final.jar  | Bin 0 -> 2342652 bytes
 .../org/apache/cassandra/transport/Message.java |   6 +-
 7 files changed, 209 insertions(+), 205 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0811824a/CHANGES.txt
--
diff --cc CHANGES.txt
index 2217659,3073fd7..38f1209
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -44,6 -13,6 +44,8 @@@ Merged from 3.0
 live rows in sstabledump (CASSANDRA-13177)
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
++Merged from 2.1:
++ * Upgrade netty version to fix memory leak with client encryption 
(CASSANDRA-13114)
  
  
  3.10

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0811824a/build.xml
--

[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-09-30 Thread aleksey 
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0db88242
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0db88242
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0db88242

Branch: refs/heads/trunk
Commit: 0db88242c66d3a7193a9ad836f9a515b3ac7f9fa
Parents: 77abf86 e819fec
Author: Aleksey Yeschenko 
Authored: Sat Sep 30 11:02:41 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Sat Sep 30 11:02:41 2017 +0100

--
 CHANGES.txt |   5 +
 .../cassandra/db/PartitionRangeReadCommand.java |  14 ++
 .../org/apache/cassandra/db/ReadCommand.java|   2 +
 .../db/SinglePartitionReadCommand.java  |   5 +
 .../apache/cassandra/db/filter/DataLimits.java  |   5 +-
 .../UnfilteredPartitionIterators.java   |  19 +-
 .../apache/cassandra/service/DataResolver.java  | 239 ++-
 7 files changed, 217 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0db88242/CHANGES.txt
--
diff --cc CHANGES.txt
index 1495c5d,61f3405..d8ba7f7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -155,7 -11,11 +155,12 @@@
   * Duplicate the buffer before passing it to analyser in SASI operation 
(CASSANDRA-13512)
   * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
  Merged from 3.0:
+  * Implement short read protection on partition boundaries (CASSANDRA-13595)
+  * Fix ISE thrown by UPI.Serializer.hasNext() for some SELECT queries 
(CASSANDRA-13911)
+  * Filter header only commit logs before recovery (CASSANDRA-13918)
   * AssertionError prepending to a list (CASSANDRA-13149)
++ * AssertionError prepending to a list (CASSANDRA-13149)
+  * Fix support for SuperColumn tables (CASSANDRA-12373)
   * Handle limit correctly on tables with strict liveness (CASSANDRA-13883)
   * Remove non-rpc-ready nodes from counter leader candidates (CASSANDRA-13043)
   * Improve short read protection performance (CASSANDRA-13794)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0db88242/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0db88242/src/java/org/apache/cassandra/db/ReadCommand.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0db88242/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0db88242/src/java/org/apache/cassandra/db/filter/DataLimits.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0db88242/src/java/org/apache/cassandra/db/partitions/UnfilteredPartitionIterators.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0db88242/src/java/org/apache/cassandra/service/DataResolver.java
--
diff --cc src/java/org/apache/cassandra/service/DataResolver.java
index 6f5fada,111d561..d4c77d1
--- a/src/java/org/apache/cassandra/service/DataResolver.java
+++ b/src/java/org/apache/cassandra/service/DataResolver.java
@@@ -522,18 -562,94 +561,94 @@@ public class DataResolver extends Respo
  return Transformation.apply(MoreRows.extend(partition, 
protection), protection);
  }
  
- private class ShortReadRowProtection extends Transformation 
implements MoreRows
+ /*
+  * We only get here once all the rows and partitions in this iterator 
have been iterated over, and so
+  * if the node had returned the requested number of rows but we still 
get here, then some results were
+  * skipped during reconciliation.
+  */
+ public UnfilteredPartitionIterator moreContents()
+ {
+ // never try to request additional partitions from replicas if 
our reconciled partitions are already filled to the limit
+ assert !mergedResultCounter.isDone();
+ 
+ // we do not apply short read protection when we have no limits 
at all
+ assert !command.limits().isUnlimited();
+ 
+ /*
+  * If this is a single partition read command or an (indexed) 
partition range read command with
+  * a partition key specified, then we can't and shouldn't try 
fetch more partitions.
+  */
+ assert !command.isLimitedToOnePartition();
+ 
+ /*
+  * If the returne

[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2017-12-26 Thread paulo 
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/702d9f1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/702d9f1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/702d9f1f

Branch: refs/heads/trunk
Commit: 702d9f1f064a4f8ea7bafb1dcbc1ac9cbf76f75e
Parents: d52326a 9337ca3
Author: Paulo Motta 
Authored: Tue Dec 26 23:19:45 2017 +1100
Committer: Paulo Motta 
Committed: Tue Dec 26 23:24:27 2017 +1100

--
 CHANGES.txt |  2 ++
 .../org/apache/cassandra/db/DiskBoundaries.java |  5 
 .../cassandra/db/DiskBoundaryManager.java   |  2 ++
 src/java/org/apache/cassandra/db/Keyspace.java  | 10 ++--
 .../db/compaction/CompactionManager.java| 20 +--
 .../compaction/CompactionStrategyManager.java   |  6 -
 .../cassandra/db/compaction/Scrubber.java   |  3 +--
 .../cassandra/db/DiskBoundaryManagerTest.java   | 27 +++-
 8 files changed, 45 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/702d9f1f/CHANGES.txt
--
diff --cc CHANGES.txt
index 3d13787,7ac528c..3826190
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,180 -1,7 +1,182 @@@
 +4.0
 + * Fix CommitLogReplayer exception for CDC data (CASSANDRA-14066)
 + * Fix cassandra-stress startup failure (CASSANDRA-14106)
 + * Remove initialDirectories from CFS (CASSANDRA-13928)
 + * Fix trivial log format error (CASSANDRA-14015)
 + * Allow sstabledump to do a json object per partition (CASSANDRA-13848)
 + * Add option to optimise merkle tree comparison across replicas 
(CASSANDRA-3200)
 + * Remove unused and deprecated methods from AbstractCompactionStrategy 
(CASSANDRA-14081)
 + * Fix Distribution.average in cassandra-stress (CASSANDRA-14090)
 + * Support a means of logging all queries as they were invoked 
(CASSANDRA-13983)
 + * Presize collections (CASSANDRA-13760)
 + * Add GroupCommitLogService (CASSANDRA-13530)
 + * Parallelize initial materialized view build (CASSANDRA-12245)
 + * Fix flaky SecondaryIndexManagerTest.assert[Not]MarkedAsBuilt 
(CASSANDRA-13965)
 + * Make LWTs send resultset metadata on every request (CASSANDRA-13992)
 + * Fix flaky indexWithFailedInitializationIsNotQueryableAfterPartialRebuild 
(CASSANDRA-13963)
 + * Introduce leaf-only iterator (CASSANDRA-9988)
 + * Upgrade Guava to 23.3 and Airline to 0.8 (CASSANDRA-13997)
 + * Allow only one concurrent call to StatusLogger (CASSANDRA-12182)
 + * Refactoring to specialised functional interfaces (CASSANDRA-13982)
 + * Speculative retry should allow more friendly params (CASSANDRA-13876)
 + * Throw exception if we send/receive repair messages to incompatible nodes 
(CASSANDRA-13944)
 + * Replace usages of MessageDigest with Guava's Hasher (CASSANDRA-13291)
 + * Add nodetool cmd to print hinted handoff window (CASSANDRA-13728)
 + * Fix some alerts raised by static analysis (CASSANDRA-13799)
 + * Checksum sstable metadata (CASSANDRA-13321, CASSANDRA-13593)
 + * Add result set metadata to prepared statement MD5 hash calculation 
(CASSANDRA-10786)
 + * Refactor GcCompactionTest to avoid boxing (CASSANDRA-13941)
 + * Expose recent histograms in JmxHistograms (CASSANDRA-13642)
 + * Fix buffer length comparison when decompressing in netty-based streaming 
(CASSANDRA-13899)
 + * Properly close StreamCompressionInputStream to release any ByteBuf 
(CASSANDRA-13906)
 + * Add SERIAL and LOCAL_SERIAL support for cassandra-stress (CASSANDRA-13925)
 + * LCS needlessly checks for L0 STCS candidates multiple times 
(CASSANDRA-12961)
 + * Correctly close netty channels when a stream session ends (CASSANDRA-13905)
 + * Update lz4 to 1.4.0 (CASSANDRA-13741)
 + * Optimize Paxos prepare and propose stage for local requests 
(CASSANDRA-13862)
 + * Throttle base partitions during MV repair streaming to prevent OOM 
(CASSANDRA-13299)
 + * Use compaction threshold for STCS in L0 (CASSANDRA-13861)
 + * Fix problem with min_compress_ratio: 1 and disallow ratio < 1 
(CASSANDRA-13703)
 + * Add extra information to SASI timeout exception (CASSANDRA-13677)
 + * Add incremental repair support for --hosts, --force, and subrange repair 
(CASSANDRA-13818)
 + * Rework CompactionStrategyManager.getScanners synchronization 
(CASSANDRA-13786)
 + * Add additional unit tests for batch behavior, TTLs, Timestamps 
(CASSANDRA-13846)
 + * Add keyspace and table name in schema validation exception 
(CASSANDRA-13845)
 + * Emit metrics whenever we hit tombstone failures and warn thresholds 
(CASSANDRA-13771)
 + * Make netty EventLoopGroups daemon threads (CASSANDRA-13837)
 + * Race condition when closing stream sessions (CASSANDRA-13852)
 + * NettyFactoryTest is failing in trunk on macOS (CASSAN

[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-04-18 Thread adelapena 
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3d1b45f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3d1b45f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3d1b45f

Branch: refs/heads/trunk
Commit: f3d1b45f13f09c4c12992667f7ee3d9649a15054
Parents: 703db6f a31a848
Author: Andrés de la Peña 
Authored: Wed Apr 18 11:21:57 2018 +0100
Committer: Andrés de la Peña 
Committed: Wed Apr 18 11:21:57 2018 +0100

--
 CHANGES.txt  |  1 +
 doc/cql3/CQL.textile | 13 +
 2 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3d1b45f/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3d1b45f/doc/cql3/CQL.textile
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-04-23 Thread marcuse 
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a2eb5ec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a2eb5ec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a2eb5ec

Branch: refs/heads/trunk
Commit: 1a2eb5ecb0760d8c7f1d3dd4da1a7ad84fbccf95
Parents: 6970ac2 22bb2cf
Author: Marcus Eriksson 
Authored: Tue Apr 24 08:38:13 2018 +0200
Committer: Marcus Eriksson 
Committed: Tue Apr 24 08:38:13 2018 +0200

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

2018-11-06 Thread bdeggleston 
Merge branch 'cassandra-3.11' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ad05643
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ad05643
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ad05643

Branch: refs/heads/trunk
Commit: 0ad056432f357800c717b4474d15c15462c079c4
Parents: 3ebeef6 af600c7
Author: Blake Eggleston 
Authored: Tue Nov 6 16:09:12 2018 -0800
Committer: Blake Eggleston 
Committed: Tue Nov 6 16:09:12 2018 -0800

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org