[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-29 Thread yukim 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 88e534a4fe2def014d43890c427b2fc3ed23fd60
Parents: a892dd8 b334f51
Author: Yuki Morishita yu...@apache.org
Authored: Wed Jul 29 19:59:38 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Jul 29 19:59:38 2015 -0500

--
 CHANGES.txt | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/88e534a4/CHANGES.txt
--
diff --cc CHANGES.txt
index 73edd83,2fe6a22..13e3acf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,5 +1,31 @@@
 +3.0
 + * Implement proper sandboxing for UDFs (CASSANDRA-9402)
 + * Simplify (and unify) cleanup of compaction leftovers (CASSANDRA-7066)
 + * Allow extra schema definitions in cassandra-stress yaml (CASSANDRA-9850)
 + * Metrics should use up to date nomenclature (CASSANDRA-9448)
 + * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384)
 + * Cleanup crc and adler code for java 8 (CASSANDRA-9650)
 + * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759, 9781, 9808, 
9825,
 +   9848, 9705, 9859, 9867, 9874, 9828, 9801)
 + * Update Guava to 18.0 (CASSANDRA-9653)
 + * Bloom filter false positive ratio is not honoured (CASSANDRA-8413)
 + * New option for cassandra-stress to leave a ratio of columns null 
(CASSANDRA-9522)
 + * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035)
 + * Add algorithmic token allocation (CASSANDRA-7032)
 + * Add nodetool command to replay batchlog (CASSANDRA-9547)
 + * Make file buffer cache independent of paths being read (CASSANDRA-8897)
 + * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 + * Change default garbage collector to G1 (CASSANDRA-7486)
 + * Populate TokenMetadata early during startup (CASSANDRA-9317)
 + * Undeprecate cache recentHitRate (CASSANDRA-6591)
 + * Add support for selectively varint encoding fields (CASSANDRA-9499, 9865)
 + * Materialized Views (CASSANDRA-6477)
 +
 +
  2.2.1
   * UDF / UDA execution time in trace (CASSANDRA-9723)
-  * Remove repair snapshot leftover on startup (CASSANDRA-7357)
-  * Use random nodes for batch log when only 2 racks (CASSANDRA-8735)
   * Fix broken internode SSL (CASSANDRA-9884)
  Merged from 2.1:
   * Fix handling of enable/disable autocompaction (CASSANDRA-9899)

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-28 Thread benedict 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 442a45a250b50b712125303b3366a550f86e3ae8
Parents: fb10df2 767cb9a
Author: Benedict Elliott Smith bened...@apache.org
Authored: Tue Jul 28 17:36:45 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Tue Jul 28 17:36:45 2015 +0100

--

--

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-28 Thread benedict 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 9dccb3f4687fce605db362d84e7318af9416ec99
Parents: 442a45a 0ba915d
Author: Benedict Elliott Smith bened...@apache.org
Authored: Tue Jul 28 18:05:57 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Tue Jul 28 18:05:57 2015 +0100

--

--

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-27 Thread snazy 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: a8c50b814b148329837631182309c648d4836da4
Parents: 76480b3 fcb5bd6
Author: Robert Stupp sn...@snazy.de
Authored: Mon Jul 27 22:39:01 2015 +0200
Committer: Robert Stupp sn...@snazy.de
Committed: Mon Jul 27 22:39:31 2015 +0200

--
 CHANGES.txt   |  5 ++---
 .../apache/cassandra/thrift/CassandraServer.java  | 18 --
 .../transport/messages/BatchMessage.java  | 11 +--
 .../transport/messages/ExecuteMessage.java|  4 
 .../transport/messages/QueryMessage.java  |  4 
 5 files changed, 31 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8c50b81/CHANGES.txt
--
diff --cc CHANGES.txt
index e3323f7,36d0485..2db4115
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,3 +1,28 @@@
 +3.0
-  HEAD
 + * Implement proper sandboxing for UDFs (CASSANDRA-9402)
- ===
 + * Simplify (and unify) cleanup of compaction leftovers (CASSANDRA-7066)
-  Introduce safer durable sstable membership management
 + * Allow extra schema definitions in cassandra-stress yaml (CASSANDRA-9850)
 + * Metrics should use up to date nomenclature (CASSANDRA-9448)
 + * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384)
 + * Cleanup crc and adler code for java 8 (CASSANDRA-9650)
 + * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759, 9781, 9808, 
9825, 9848,
 +   9705, 9859, 9867, 9874, 9828, 9801)
 + * Update Guava to 18.0 (CASSANDRA-9653)
 + * Bloom filter false positive ratio is not honoured (CASSANDRA-8413)
 + * New option for cassandra-stress to leave a ratio of columns null 
(CASSANDRA-9522)
 + * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035)
 + * Add algorithmic token allocation (CASSANDRA-7032)
 + * Add nodetool command to replay batchlog (CASSANDRA-9547)
 + * Make file buffer cache independent of paths being read (CASSANDRA-8897)
 + * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 + * Change default garbage collector to G1 (CASSANDRA-7486)
 + * Populate TokenMetadata early during startup (CASSANDRA-9317)
 + * undeprecate cache recentHitRate (CASSANDRA-6591)
 + * Add support for selectively varint encoding fields (CASSANDRA-9499)
 +
 +
  2.2.1
   * UDF / UDA execution time in trace (CASSANDRA-9723)
   * Remove repair snapshot leftover on startup (CASSANDRA-7357)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8c50b81/src/java/org/apache/cassandra/thrift/CassandraServer.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8c50b81/src/java/org/apache/cassandra/transport/messages/QueryMessage.java
--

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-23 Thread yukim 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: d9dfbddbeefa6f5591b8609d4cd796e77d010a0c
Parents: c912668 51ff499
Author: Yuki Morishita yu...@apache.org
Authored: Thu Jul 23 10:27:43 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Thu Jul 23 10:27:43 2015 -0500

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/db/BatchlogManager.java| 4 +++-
 .../apache/cassandra/service/BatchlogEndpointFilterTest.java | 8 
 3 files changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9dfbddb/CHANGES.txt
--
diff --cc CHANGES.txt
index 67566fb,b8593c0..d405a4d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -24,8 -1,8 +24,9 @@@
  2.2.1
   * UDF / UDA execution time in trace (CASSANDRA-9723)
   * Remove repair snapshot leftover on startup (CASSANDRA-7357)
+  * Use random nodes for batch log when only 2 racks (CASSANDRA-8735)
  
 +
  2.2.0
   * Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795) 
   * Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9dfbddb/src/java/org/apache/cassandra/db/BatchlogManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9dfbddb/test/unit/org/apache/cassandra/service/BatchlogEndpointFilterTest.java
--
diff --cc test/unit/org/apache/cassandra/service/BatchlogEndpointFilterTest.java
index 186cc41,3a19b75..be33e3f
--- a/test/unit/org/apache/cassandra/service/BatchlogEndpointFilterTest.java
+++ b/test/unit/org/apache/cassandra/service/BatchlogEndpointFilterTest.java
@@@ -20,11 -20,13 +20,12 @@@ package org.apache.cassandra.service
  import java.net.InetAddress;
  import java.net.UnknownHostException;
  import java.util.Collection;
+ import java.util.HashSet;
  
 -import org.junit.Test;
 -import org.junit.matchers.JUnitMatchers;
 -
  import com.google.common.collect.ImmutableMultimap;
  import com.google.common.collect.Multimap;
 +import org.junit.Test;
 +import org.junit.matchers.JUnitMatchers;
  
  import org.apache.cassandra.db.BatchlogManager;

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-21 Thread yukim 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 9ae7126d3043071e02fc413c65bfbb092c852276
Parents: ece5cfc fb4656f
Author: Yuki Morishita yu...@apache.org
Authored: Tue Jul 21 23:18:59 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Tue Jul 21 23:18:59 2015 -0500

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 55 --
 .../org/apache/cassandra/db/Directories.java| 61 +++-
 .../repair/RepairMessageVerbHandler.java|  3 +-
 .../cassandra/db/ColumnFamilyStoreTest.java | 40 -
 .../unit/org/apache/cassandra/db/ScrubTest.java |  2 +-
 6 files changed, 138 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ae7126d/CHANGES.txt
--
diff --cc CHANGES.txt
index 2a3aecd,e1d1fba..3769f83
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,7 +1,30 @@@
 +3.0
 + * Allow extra schema definitions in cassandra-stress yaml (CASSANDRA-9850)
 + * Metrics should use up to date nomenclature (CASSANDRA-9448)
 + * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384)
 + * Cleanup crc and adler code for java 8 (CASSANDRA-9650)
 + * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759, 9781, 9808, 
9825, 9848)
 + * Update Guava to 18.0 (CASSANDRA-9653)
 + * Bloom filter false positive ratio is not honoured (CASSANDRA-8413)
 + * New option for cassandra-stress to leave a ratio of columns null 
(CASSANDRA-9522)
 + * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035)
 + * Add algorithmic token allocation (CASSANDRA-7032)
 + * Add nodetool command to replay batchlog (CASSANDRA-9547)
 + * Make file buffer cache independent of paths being read (CASSANDRA-8897)
 + * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 + * Change default garbage collector to G1 (CASSANDRA-7486)
 + * Populate TokenMetadata early during startup (CASSANDRA-9317)
 + * undeprecate cache recentHitRate (CASSANDRA-6591)
 + * Add support for selectively varint encoding fields (CASSANDRA-9499)
 +
 +
  2.2.1
   * UDF / UDA execution time in trace (CASSANDRA-9723)
+  * Remove repair snapshot leftover on startup (CASSANDRA-7357)
  
 +
  2.2.0
   * Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795) 
   * Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ae7126d/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index f74fd3c,7d52a94..d3ad4e6
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -39,8 -40,6 +40,7 @@@ import org.apache.cassandra.db.lifecycl
  import org.apache.cassandra.db.lifecycle.Tracker;
  import org.apache.cassandra.db.lifecycle.LifecycleTransaction;
  import org.apache.cassandra.io.FSWriteError;
 +import org.apache.cassandra.metrics.TableMetrics;
- import org.apache.cassandra.utils.memory.MemtablePool;
  import org.json.simple.*;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ae7126d/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
--
diff --cc test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index 3620bd0,b5e62b3..deb1480
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@@ -28,60 -54,119 +28,63 @@@ import org.junit.BeforeClass
  import org.junit.Test;
  import org.junit.runner.RunWith;
  
 -import org.apache.cassandra.OrderedJUnit4ClassRunner;
 -import org.apache.cassandra.SchemaLoader;
 -import org.apache.cassandra.Util;
 +import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertTrue;
 +
 +import com.google.common.collect.Iterators;
 +import org.apache.cassandra.*;
  import org.apache.cassandra.config.*;
  import org.apache.cassandra.cql3.Operator;
 -import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
 -import org.apache.cassandra.db.composites.CellName;
 -import org.apache.cassandra.db.composites.CellNameType;
 -import

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-20 Thread benedict 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 2fa00679071a1489dea652c43ac84572aa1dc32f
Parents: 030762a 8d87c28
Author: Benedict Elliott Smith bened...@apache.org
Authored: Mon Jul 20 12:52:35 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Mon Jul 20 12:52:35 2015 +0100

--
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fa00679/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-17 Thread slebresne 
Merge branch 'cassandra-2.2' into trunk

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 05a5fb4f8b7bf76be0d95196a3231c5be61ee978
Parents: 412e874 f60e4ad
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Jul 17 15:40:40 2015 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Jul 17 15:40:40 2015 +0200

--
 CHANGES.txt |  4 +++-
 .../cassandra/io/util/SequentialWriter.java | 22 ++--
 2 files changed, 23 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/05a5fb4f/CHANGES.txt
--
diff --cc CHANGES.txt
index db306ea,47d1db5..b2abd10
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,15 +1,36 @@@
 +3.0
 + * Metrics should use up to date nomenclature (CASSANDRA-9448)
 + * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384)
 + * Cleanup crc and adler code for java 8 (CASSANDRA-9650)
 + * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759, 9781, 9808, 
9825)
 + * Update Guava to 18.0 (CASSANDRA-9653)
 + * Bloom filter false positive ratio is not honoured (CASSANDRA-8413)
 + * New option for cassandra-stress to leave a ratio of columns null 
(CASSANDRA-9522)
 + * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035)
 + * Add algorithmic token allocation (CASSANDRA-7032)
 + * Add nodetool command to replay batchlog (CASSANDRA-9547)
 + * Make file buffer cache independent of paths being read (CASSANDRA-8897)
 + * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 + * Change default garbage collector to G1 (CASSANDRA-7486)
 + * Populate TokenMetadata early during startup (CASSANDRA-9317)
 + * undeprecate cache recentHitRate (CASSANDRA-6591)
 + * Add support for selectively varint encoding fields (CASSANDRA-9499)
 +
 +
  2.2.0-rc3
+  * Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797)
+  * sum() and avg() functions missing for smallint and tinyint types 
(CASSANDRA-9671)
   * Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
  Merged from 2.1:
   * Fix broken logging for empty flushes in Memtable (CASSANDRA-9837)
   * Handle corrupt files on startup (CASSANDRA-9686)
   * Fix clientutil jar and tests (CASSANDRA-9760)
   * (cqlsh) Allow the SSL protocol version to be specified through the
 -   config file or environment variables (CASSANDRA-9544)
 +config file or environment variables (CASSANDRA-9544)
  Merged from 2.0:
+  * Complete CASSANDRA-8448 fix (CASSANDRA-9519)
   * Don't include auth credentials in debug log (CASSANDRA-9682)
   * Can't transition from write survey to normal mode (CASSANDRA-9740)
   * Scrub (recover) sstables even when -Index.db is missing (CASSANDRA-9591)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/05a5fb4f/src/java/org/apache/cassandra/io/util/SequentialWriter.java
--

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-17 Thread snazy 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: f5f3ae1da45d633c5eb03b3fe760b4e866dca9d7
Parents: 689582c f74419c
Author: Robert Stupp sn...@snazy.de
Authored: Fri Jul 17 08:37:49 2015 +0200
Committer: Robert Stupp sn...@snazy.de
Committed: Fri Jul 17 08:37:49 2015 +0200

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/db/Memtable.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5f3ae1d/CHANGES.txt
--
diff --cc CHANGES.txt
index 4e2c22e,e6c093d..76d6e92
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,8 +1,28 @@@
 +3.0
 + * Metrics should use up to date nomenclature (CASSANDRA-9448)
 + * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384)
 + * Cleanup crc and adler code for java 8 (CASSANDRA-9650)
 + * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759, 9781, 9808)
 + * Update Guava to 18.0 (CASSANDRA-9653)
 + * Bloom filter false positive ratio is not honoured (CASSANDRA-8413)
 + * New option for cassandra-stress to leave a ratio of columns null 
(CASSANDRA-9522)
 + * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035)
 + * Add algorithmic token allocation (CASSANDRA-7032)
 + * Add nodetool command to replay batchlog (CASSANDRA-9547)
 + * Make file buffer cache independent of paths being read (CASSANDRA-8897)
 + * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 + * Change default garbage collector to G1 (CASSANDRA-7486)
 + * Populate TokenMetadata early during startup (CASSANDRA-9317)
 + * undeprecate cache recentHitRate (CASSANDRA-6591)
 + * Add support for selectively varint encoding fields (CASSANDRA-9499)
 +
 +
  2.2.0-rc3
 - * sum() and avg() functions missing for smallint and tinyint types 
(CASSANDRA-9671)
   * Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
  Merged from 2.1:
+  * Fix broken logging for empty flushes in Memtable (CASSANDRA-9837)
   * Complete CASSANDRA-8448 fix (CASSANDRA-9519)
   * Handle corrupt files on startup (CASSANDRA-9686)
   * Fix clientutil jar and tests (CASSANDRA-9760)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5f3ae1d/src/java/org/apache/cassandra/db/Memtable.java
--

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-08 Thread jasobrown 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: b053af2da8e84be5c8900f0312bbe1677ef6a8df
Parents: 2ae4163 bf0328f
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Jul 8 14:14:40 2015 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Jul 8 14:14:40 2015 -0700

--
 CHANGES.txt |   1 +
 .../cassandra/service/StorageService.java   |   2 +-
 .../operations/InsertUpdateIfCondition.java | 861 ---
 .../operations/InsertUpdateIfConditionTest.java | 861 +++
 4 files changed, 863 insertions(+), 862 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b053af2d/src/java/org/apache/cassandra/service/StorageService.java
--

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-06 Thread benedict 
Merge branch 'cassandra-2.2' into trunk

Conflicts:
test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java


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

Branch: refs/heads/trunk
Commit: 2d7fec94f13dd8a7d2b14179fc89202413bdcbf7
Parents: 582ef4b 1f430c5
Author: Benedict Elliott Smith bened...@apache.org
Authored: Mon Jul 6 12:14:50 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Mon Jul 6 12:14:50 2015 +0100

--
 .../cassandra/db/compaction/CompactionTask.java  |  5 +
 .../apache/cassandra/db/lifecycle/Helpers.java   | 10 ++
 .../db/lifecycle/LifecycleTransaction.java   |  8 +++-
 .../apache/cassandra/db/lifecycle/Tracker.java   | 16 
 .../cassandra/io/sstable/SSTableRewriter.java|  9 +++--
 .../io/sstable/SSTableRewriterTest.java  | 19 +++
 6 files changed, 44 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d7fec94/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d7fec94/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d7fec94/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
--
diff --cc test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
index 863ae4c,105ecf6..84568c3
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
@@@ -248,26 -234,16 +243,25 @@@ public class SSTableRewriterTest extend
  Keyspace keyspace = Keyspace.open(KEYSPACE);
  ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF);
  truncate(cfs);
- assertEquals(0, cfs.metric.liveDiskSpaceUsed.getCount());
  
 -ArrayBackedSortedColumns cf = 
ArrayBackedSortedColumns.factory.create(cfs.metadata);
 -for (int i = 0; i  100; i++)
 -cf.addColumn(Util.cellname(i), ByteBuffer.allocate(1000), 1);
  File dir = cfs.directories.getDirectoryForNewSSTables();
 -
 -try (SSTableWriter writer = getWriter(cfs, dir);)
 +try (SSTableWriter writer = getWriter(cfs, dir))
  {
  for (int i = 0; i  1; i++)
 -
writer.append(StorageService.getPartitioner().decorateKey(random(i, 10)), cf);
 +{
 +RowUpdateBuilder builder = new RowUpdateBuilder(cfs.metadata, 
1,  random(i, 10));
 +
 +PartitionUpdate update = null;
 +
 +for (int j = 0; j  100; j++)
 +{
 +builder.clustering( + j).add(val, 
ByteBuffer.allocate(1000));
 +update = builder.buildUpdate();
 +}
 +
 +writer.append(update.unfilteredIterator());
 +}
 +
  SSTableReader s = writer.setMaxDataAge(1000).openEarly();
  assert s != null;
  assertFileCounts(dir.list(), 2, 2);

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-06 Thread benedict 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 160296cd307681e736ac63d67891d9d2b01759e5
Parents: 2d7fec9 77a666c
Author: Benedict Elliott Smith bened...@apache.org
Authored: Mon Jul 6 12:50:03 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Mon Jul 6 12:50:03 2015 +0100

--
 .../org/apache/cassandra/io/sstable/SSTableRewriterTest.java  | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/160296cd/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
--

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-07-02 Thread benedict 
Merge branch 'cassandra-2.2' into trunk

Conflicts:
src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
src/java/org/apache/cassandra/utils/memory/HeapPool.java


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

Branch: refs/heads/trunk
Commit: dea6ab1b769943eedaeb590d545d7c476c4a2466
Parents: 03f72ac 99f7ce9
Author: Benedict Elliott Smith bened...@apache.org
Authored: Thu Jul 2 10:34:46 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Thu Jul 2 10:34:46 2015 +0100

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 22 +-
 src/java/org/apache/cassandra/db/Memtable.java  | 15 ++--
 .../db/partitions/AtomicBTreePartition.java |  2 +-
 .../org/apache/cassandra/utils/FBUtilities.java | 10 +++
 .../utils/memory/MemtableAllocator.java | 39 +++
 .../cassandra/utils/memory/MemtablePool.java| 73 
 .../utils/memory/NativeAllocatorTest.java   | 18 -
 8 files changed, 131 insertions(+), 49 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dea6ab1b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dea6ab1b/src/java/org/apache/cassandra/db/Memtable.java
--
diff --cc src/java/org/apache/cassandra/db/Memtable.java
index e82c35e,6e4802f..b6341aa
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@@ -253,35 -256,23 +253,36 @@@ public class Memtable implements Compar
  public String toString()
  {
  return String.format(Memtable-%s@%s(%s serialized bytes, %s ops, 
%.0f%%/%.0f%% of on/off-heap limit),
-  cfs.name, hashCode(), liveDataSize, 
currentOperations, 100 * allocator.onHeap().ownershipRatio(), 100 * 
allocator.offHeap().ownershipRatio());
+  cfs.name, hashCode(), 
FBUtilities.prettyPrintMemory(liveDataSize.get()), currentOperations,
+  100 * allocator.onHeap().ownershipRatio(), 100 * 
allocator.offHeap().ownershipRatio());
  }
  
 -/**
 - * @param startWith Include data in the result from and including this 
key and to the end of the memtable
 - * @return An iterator of entries with the data from the start key
 - */
 -public IteratorMap.EntryDecoratedKey, ColumnFamily 
getEntryIterator(final RowPosition startWith, final RowPosition stopAt)
 +public UnfilteredPartitionIterator makePartitionIterator(final 
ColumnFilter columnFilter, final DataRange dataRange, final boolean isForThrift)
  {
 -return new IteratorMap.EntryDecoratedKey, ColumnFamily()
 -{
 -private Iterator? extends Map.Entry? extends RowPosition, 
AtomicBTreeColumns iter = stopAt.isMinimum()
 -? rows.tailMap(startWith).entrySet().iterator()
 -: rows.subMap(startWith, true, stopAt, 
true).entrySet().iterator();
 +AbstractBoundsPartitionPosition keyRange = dataRange.keyRange();
 +
 +boolean startIsMin = keyRange.left.isMinimum();
 +boolean stopIsMin = keyRange.right.isMinimum();
 +
 +boolean isBound = keyRange instanceof Bounds;
 +boolean includeStart = isBound || keyRange instanceof 
IncludingExcludingBounds;
 +boolean includeStop = isBound || keyRange instanceof Range;
 +MapPartitionPosition, AtomicBTreePartition subMap;
 +if (startIsMin)
 +subMap = stopIsMin ? partitions : 
partitions.headMap(keyRange.right, includeStop);
 +else
 +subMap = stopIsMin
 +   ? partitions.tailMap(keyRange.left, includeStart)
 +   : partitions.subMap(keyRange.left, includeStart, 
keyRange.right, includeStop);
 +
 +final IteratorMap.EntryPartitionPosition, AtomicBTreePartition 
iter = subMap.entrySet().iterator();
  
 -private Map.Entry? extends RowPosition, ? extends ColumnFamily 
currentEntry;
 +return new AbstractUnfilteredPartitionIterator()
 +{
 +public boolean isForThrift()
 +{
 +return isForThrift;
 +}
  
  public boolean hasNext()
  {

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-06-28 Thread benedict 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 3671082b037c05979740c9bc5a4ee3a4a4425bf7
Parents: 6739434 02a7c34
Author: Benedict Elliott Smith bened...@apache.org
Authored: Sun Jun 28 11:40:00 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Sun Jun 28 11:40:00 2015 +0100

--

--

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-06-25 Thread samt 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 3572cfdce46f6728424dfd0c877e28cc72154b31
Parents: 3f0dd5d 8b9c91e
Author: Sam Tunnicliffe s...@beobal.com
Authored: Thu Jun 25 10:02:54 2015 +0100
Committer: Sam Tunnicliffe s...@beobal.com
Committed: Thu Jun 25 10:02:54 2015 +0100

--
 CHANGES.txt |  1 +
 .../format/big/SSTableNamesIterator.java|  3 --
 .../cassandra/cql3/LargeCompactValueTest.java   | 50 
 3 files changed, 51 insertions(+), 3 deletions(-)
--


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

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-06-23 Thread benedict 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: b7e72e1eefcd883c2cbc757ae42e455699d50bfd
Parents: 1902653 0d4065e
Author: Benedict Elliott Smith bened...@apache.org
Authored: Wed Jun 24 00:14:49 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Wed Jun 24 00:14:49 2015 +0100

--
 CHANGES.txt  |  1 +
 .../org/apache/cassandra/db/ColumnFamilyStore.java   | 15 +++
 .../cassandra/db/compaction/CompactionTask.java  |  4 +++-
 3 files changed, 19 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7e72e1e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7e72e1e/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 17e55bf,6aa59e4..7dbeb44
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@@ -157,9 -158,9 +158,10 @@@ public class CompactionTask extends Abs
  // SSTableScanners need to be closed before 
markCompactedSSTablesReplaced call as scanners contain references
  // to both ifile and dfile and SSTR will throw deletion errors on 
Windows if it tries to delete before scanner is closed.
  // See CASSANDRA-8019 and CASSANDRA-8399
- try (AbstractCompactionStrategy.ScannerList scanners = 
strategy.getScanners(actuallyCompact))
+ try (RefsSSTableReader refs = Refs.ref(actuallyCompact);
+  AbstractCompactionStrategy.ScannerList scanners = 
strategy.getScanners(actuallyCompact))
  {
 +
  ci = new CompactionIterable(compactionType, 
scanners.scanners, controller, sstableFormat, taskId);
  try (CloseableIteratorAbstractCompactedRow iter = 
ci.iterator())
  {

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-06-18 Thread jake 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 8ad6dc9af3e569a22bce178827aca93de3bdc352
Parents: 40424ee 70d0d5f
Author: T Jake Luciani j...@apache.org
Authored: Thu Jun 18 14:50:17 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Thu Jun 18 14:50:17 2015 -0400

--
 CHANGES.txt   | 1 +
 .../org/apache/cassandra/io/sstable/format/SSTableReader.java | 3 +++
 2 files changed, 4 insertions(+)
--


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

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-06-17 Thread yukim 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 43d21c384b4212f8731edfae33142c0a5676c474
Parents: 4c4c432 dee675f
Author: Yuki Morishita yu...@apache.org
Authored: Wed Jun 17 21:58:02 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Jun 17 21:58:02 2015 -0500

--
 CHANGES.txt |  3 +-
 .../cassandra/service/StorageService.java   | 48 +---
 2 files changed, 34 insertions(+), 17 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/43d21c38/src/java/org/apache/cassandra/service/StorageService.java
--

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-06-16 Thread samt 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 74cef19fd3f90d3dd89007684b18c1edb31d098f
Parents: 07bb8f9 6c4c146
Author: Sam Tunnicliffe s...@beobal.com
Authored: Tue Jun 16 21:39:33 2015 +0100
Committer: Sam Tunnicliffe s...@beobal.com
Committed: Tue Jun 16 21:39:33 2015 +0100

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


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

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-06-03 Thread benedict 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 03603b6d84ffd221fb5df8d399566fc77ec71922
Parents: 06b2bd3 49cb12a
Author: Benedict Elliott Smith bened...@apache.org
Authored: Wed Jun 3 22:55:49 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Wed Jun 3 22:55:49 2015 +0100

--
 .../cassandra/db/lifecycle/TrackerTest.java |  1 +
 .../io/sstable/IndexSummaryManagerTest.java | 72 
 2 files changed, 1 insertion(+), 72 deletions(-)
--

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-06-03 Thread benedict 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 36e4f4f3e041dae4b43da056b813f22ed2bc9cb3
Parents: 304eae3 d5947ee
Author: Benedict Elliott Smith bened...@apache.org
Authored: Wed Jun 3 13:11:46 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Wed Jun 3 13:11:46 2015 +0100

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


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

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-06-03 Thread benedict 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 34962c300fe357283b066bd76dccf1ced55613e2
Parents: 0603af9 46ea040
Author: Benedict Elliott Smith bened...@apache.org
Authored: Wed Jun 3 17:02:08 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Wed Jun 3 17:02:08 2015 +0100

--
 CHANGES.txt |  1 +
 .../io/sstable/SSTableSimpleUnsortedWriter.java | 19 +
 .../io/sstable/CQLSSTableWriterTest.java| 29 
 3 files changed, 44 insertions(+), 5 deletions(-)
--


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

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-06-03 Thread jbellis 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 06b2bd3b886041b9e7904138295532939a67540f
Parents: 34962c3 4cc5fd1
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Jun 3 10:32:08 2015 -0700
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Jun 3 10:32:08 2015 -0700

--
 CHANGES.txt |  1 +
 NEWS.txt| 13 +
 conf/cassandra.yaml | 11 +++
 3 files changed, 21 insertions(+), 4 deletions(-)
--


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

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-06-02 Thread slebresne 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: f90207c0661812ad1dc6bc6d7672898406cf9ec0
Parents: 525579d a30d8bd
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Jun 2 14:58:18 2015 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Jun 2 14:58:18 2015 +0200

--
 CHANGES.txt |  1 +
 .../io/sstable/SSTableIdentityIterator.java | 10 
 .../io/sstable/format/SSTableReader.java| 57 +++-
 .../compaction/BlacklistingCompactionsTest.java | 17 +++---
 4 files changed, 67 insertions(+), 18 deletions(-)
--


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

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-05-27 Thread tylerhobbs 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: eb60f3101985b67eba8f96af63b0a214c4f41969
Parents: e9a263d 80ba11c
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Wed May 27 13:54:09 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Wed May 27 13:54:09 2015 -0500

--
 CHANGES.txt |  3 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  4 +-
 src/java/org/apache/cassandra/db/DataRange.java | 82 ---
 .../cassandra/db/SliceFromReadCommand.java  | 28 +++
 .../cassandra/db/filter/ColumnCounter.java  | 63 ++-
 .../cassandra/db/filter/SliceQueryFilter.java   | 83 ++--
 .../service/pager/AbstractQueryPager.java   | 40 --
 .../service/pager/RangeSliceQueryPager.java |  4 +-
 .../service/pager/SliceQueryPager.java  |  6 +-
 .../service/pager/AbstractQueryPagerTest.java   |  8 +-
 10 files changed, 281 insertions(+), 40 deletions(-)
--


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

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-05-21 Thread samt 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 615c1bac6283ab098ab33cc01c25ca92191ee395
Parents: 63da823 868e720
Author: Sam Tunnicliffe s...@beobal.com
Authored: Thu May 21 13:43:09 2015 +0100
Committer: Sam Tunnicliffe s...@beobal.com
Committed: Thu May 21 13:43:09 2015 +0100

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  1 -
 src/java/org/apache/cassandra/db/Memtable.java  |  5 +
 .../cassandra/metrics/ColumnFamilyMetrics.java  | 20 +---
 .../org/apache/cassandra/tools/NodeProbe.java   |  1 +
 .../cassandra/tools/nodetool/TableStats.java|  7 ++-
 6 files changed, 26 insertions(+), 9 deletions(-)
--


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

[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

2015-05-16 Thread benedict 
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: c2a1cd49687ad1e4dec35ef01c0bac75fbd0f806
Parents: a1b1cf6 ff10d63
Author: Benedict Elliott Smith bened...@apache.org
Authored: Sat May 16 11:02:16 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Sat May 16 11:02:16 2015 +0100

--

--