[3/3] cassandra git commit: Merge branch 'cassandra-3.7' into trunk

2016-06-05 Thread tylerhobbs 
Merge branch 'cassandra-3.7' into trunk


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

Branch: refs/heads/trunk
Commit: a07db4945b020959d3255f67ac6ef50571a26ea8
Parents: 640bd29 40e4b0b
Author: Tyler Hobbs 
Authored: Sun Jun 5 18:29:39 2016 -0500
Committer: Tyler Hobbs 
Committed: Sun Jun 5 18:29:39 2016 -0500

--
 CHANGES.txt |  2 +
 .../org/apache/cassandra/db/LegacyLayout.java   | 77 +++-
 2 files changed, 77 insertions(+), 2 deletions(-)
--


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

[3/3] cassandra git commit: Merge branch 'cassandra-3.7' into trunk

2016-06-03 Thread stefania 
Merge branch 'cassandra-3.7' into trunk


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

Branch: refs/heads/trunk
Commit: 672874c08cf7b731891eff323c9388453a6b7993
Parents: d9e79bd 5a7ff5e
Author: Stefania Alborghetti 
Authored: Fri Jun 3 16:30:18 2016 +0200
Committer: Stefania Alborghetti 
Committed: Fri Jun 3 16:30:18 2016 +0200

--
 CHANGES.txt |  1 +
 .../db/compaction/CompactionManager.java|  9 ++--
 .../compaction/CompactionStrategyManager.java   | 43 ++--
 test/unit/org/apache/cassandra/Util.java|  5 ++-
 .../db/compaction/CompactionsPurgeTest.java |  9 +++-
 5 files changed, 57 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/672874c0/CHANGES.txt
--
diff --cc CHANGES.txt
index e9dd9d4,9e3857b..0de27e0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
 +3.8
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 +
 +
  3.7
+  * Support multiple folders for user defined compaction tasks 
(CASSANDRA-11765)
   * Fix race in CompactionStrategyManager's pause/resume (CASSANDRA-11922)
  Merged from 3.0:
   * Fix Directories instantiations where CFS.initialDirectories should be used 
(CASSANDRA-11849)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/672874c0/test/unit/org/apache/cassandra/Util.java
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.7' into trunk

2016-05-31 Thread yukim 
Merge branch 'cassandra-3.7' into trunk


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

Branch: refs/heads/trunk
Commit: 61c988e519733874897807f8ec64c73602a088c9
Parents: e14e731 f40c632
Author: Yuki Morishita 
Authored: Tue May 31 15:53:00 2016 -0500
Committer: Yuki Morishita 
Committed: Tue May 31 15:53:00 2016 -0500

--
 CHANGES.txt |  1 +
 .../compaction/CompactionStrategyManager.java   | 40 +++-
 .../cassandra/db/compaction/CompactionTask.java |  2 +-
 3 files changed, 33 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/61c988e5/CHANGES.txt
--
diff --cc CHANGES.txt
index 842174e,d7b3dd4..eecf2ca
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
 +3.8
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 +
 +
  3.7
+  * Fix race in CompactionStrategyManager's pause/resume (CASSANDRA-11922)
  Merged from 3.0:
   * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
   * Don't use static dataDirectories field in Directories instances 
(CASSANDRA-11647)

[3/3] cassandra git commit: Merge branch 'cassandra-3.7' into trunk

2016-05-27 Thread tylerhobbs 
Merge branch 'cassandra-3.7' into trunk


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

Branch: refs/heads/trunk
Commit: 692d9992db6cb78fbbf285070faec00d7ffbe8e3
Parents: 5ca8052 22e0a1d
Author: Tyler Hobbs 
Authored: Fri May 27 15:48:30 2016 -0500
Committer: Tyler Hobbs 
Committed: Fri May 27 15:48:30 2016 -0500

--
 CHANGES.txt  | 1 +
 bin/cqlsh.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


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

[3/3] cassandra git commit: Merge branch 'cassandra-3.7' into trunk

2016-05-27 Thread tylerhobbs 
Merge branch 'cassandra-3.7' into trunk


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

Branch: refs/heads/trunk
Commit: 5ca8052a9cb6aaf350c25c340bf03069a846f443
Parents: 89f275c a2dd005
Author: Tyler Hobbs 
Authored: Fri May 27 12:38:14 2016 -0500
Committer: Tyler Hobbs 
Committed: Fri May 27 12:38:14 2016 -0500

--
 CHANGES.txt |  2 +
 .../io/sstable/format/SSTableReader.java| 71 +---
 2 files changed, 3 insertions(+), 70 deletions(-)
--


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

[3/3] cassandra git commit: Merge branch 'cassandra-3.7' into trunk

2016-05-26 Thread tylerhobbs 
Merge branch 'cassandra-3.7' into trunk


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

Branch: refs/heads/trunk
Commit: 49278480d9d990e25f8ae7d939e5fd92d87864e8
Parents: bbc3834 f24e066
Author: Tyler Hobbs 
Authored: Thu May 26 11:37:59 2016 -0500
Committer: Tyler Hobbs 
Committed: Thu May 26 11:37:59 2016 -0500

--
 CHANGES.txt|  2 ++
 src/java/org/apache/cassandra/db/Keyspace.java | 12 +---
 2 files changed, 7 insertions(+), 7 deletions(-)
--


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

[3/3] cassandra git commit: Merge branch 'cassandra-3.7' into trunk

2016-05-19 Thread aleksey 
Merge branch 'cassandra-3.7' into trunk


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

Branch: refs/heads/trunk
Commit: 74f41c9cc61959748aa2cb6b42186ecfd8587796
Parents: da9bb03 f294750
Author: Aleksey Yeschenko 
Authored: Thu May 19 16:09:23 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Thu May 19 16:09:23 2016 +0100

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/db/Directories.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/74f41c9c/CHANGES.txt
--
diff --cc CHANGES.txt
index 854ae53,4c50980..4a5dbf4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +3.8
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)
 +
 +
  3.7
+  * Don't use static dataDirectories field in Directories instances 
(CASSANDRA-11647)
  Merged from 3.0:
   * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
   * Allow compaction strategies to disable early open (CASSANDRA-11754)

[3/3] cassandra git commit: Merge branch 'cassandra-3.7' into trunk

2016-05-18 Thread tylerhobbs 
Merge branch 'cassandra-3.7' into trunk


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

Branch: refs/heads/trunk
Commit: 5bdf3184bdcba969a67f8b5093bdc1a4657cc3c2
Parents: 0f483d8 424b0b9
Author: Tyler Hobbs 
Authored: Wed May 18 15:16:23 2016 -0500
Committer: Tyler Hobbs 
Committed: Wed May 18 15:16:23 2016 -0500

--
 CHANGES.txt|  2 ++
 .../org/apache/cassandra/db/marshal/AbstractType.java  |  8 
 src/java/org/apache/cassandra/db/marshal/ListType.java | 11 +++
 src/java/org/apache/cassandra/db/marshal/MapType.java  | 13 -
 src/java/org/apache/cassandra/db/marshal/SetType.java  | 11 +++
 src/java/org/apache/cassandra/db/marshal/UserType.java |  5 -
 .../apache/cassandra/schema/LegacySchemaMigrator.java  |  9 ++---
 7 files changed, 38 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bdf3184/CHANGES.txt
--
diff --cc CHANGES.txt
index 4ace3a7,d029c7b..adadefd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -18,8 -9,9 +18,10 @@@ Merged from 2.2
   * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
   * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
  
 +
  3.6
+  * Correctly migrate schema for frozen UDTs during 2.x -> 3.x upgrades
+(does not affect any released versions) (CASSANDRA-11613)
   * Allow server startup if JMX is configured directly (CASSANDRA-11725)
   * Prevent direct memory OOM on buffer pool allocations (CASSANDRA-11710)
   * Enhanced Compaction Logging (CASSANDRA-10805)

[3/3] cassandra git commit: Merge branch 'cassandra-3.7' into trunk

2016-05-13 Thread marcuse 
Merge branch 'cassandra-3.7' into trunk


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

Branch: refs/heads/trunk
Commit: 3f46df541a238630f44e23f21c16cd1bf2d725c7
Parents: bd39d73 590d20b
Author: Marcus Eriksson 
Authored: Fri May 13 09:13:18 2016 +0200
Committer: Marcus Eriksson 
Committed: Fri May 13 09:13:18 2016 +0200

--
 .../LongLeveledCompactionStrategyTest.java  | 27 +---
 .../LeveledCompactionStrategyTest.java  |  2 +-
 2 files changed, 25 insertions(+), 4 deletions(-)
--

[3/3] cassandra git commit: Merge branch 'cassandra-3.7' into trunk

2016-05-12 Thread snazy 
Merge branch 'cassandra-3.7' into trunk


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

Branch: refs/heads/trunk
Commit: fbc07eb2768a8114ee03318acc080e9c5885d548
Parents: 755c783 902877a
Author: Robert Stupp 
Authored: Thu May 12 12:04:49 2016 +0100
Committer: Robert Stupp 
Committed: Thu May 12 12:04:49 2016 +0100

--
 .../apache/cassandra/cql3/functions/UDHelper.java | 15 +++
 .../cql3/validation/entities/UFTest.java  | 18 +-
 2 files changed, 24 insertions(+), 9 deletions(-)
--