[10/10] git commit: Merge branch 'cassandra-2.0' into trunk

2013-12-04 Thread jbellis 
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 6772247f828e3740aff737b8c4463612ba8d4b17
Parents: e4d4472 cf83c81
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Dec 4 17:56:45 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Dec 4 17:56:45 2013 -0600

--
 CHANGES.txt  | 6 --
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
--


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

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

[10/10] git commit: Merge branch 'cassandra-2.0' into trunk

2013-09-23 Thread jbellis 
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 64309eeb8adebc5106c4e51da22b2f4920f1385e
Parents: bbab80f 5176ce7
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Sep 23 09:31:50 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Sep 23 09:31:50 2013 -0500

--
 CHANGES.txt | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/64309eeb/CHANGES.txt
--
diff --cc CHANGES.txt
index be19c73,bae83ca..9917ec1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,9 +1,17 @@@
 +2.1
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 +
 +
  2.0.2
   * Move batchlog replay to its own executor (CASSANDRA-6079)
+ Merged from 1.2:
+  * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+  * Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
+  * Do not open non-ssl storage port if encryption option is all 
(CASSANDRA-3916)
   * Improve memory usage of metadata min/max column names (CASSANDRA-6077)

[10/10] git commit: Merge branch 'cassandra-2.0' into trunk

2013-08-21 Thread jbellis 
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 487e3de0559df55d99132814e9c06aa458a23748
Parents: 0da21de 9e29619
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Aug 21 12:31:50 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Aug 21 12:31:50 2013 -0500

--
 src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[10/10] git commit: Merge branch 'cassandra-2.0' into trunk

2013-08-21 Thread yukim 
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: c43a59cccadd48c005cb4da618f6140b46d829f0
Parents: 487e3de d6e0ca0
Author: Yuki Morishita yu...@apache.org
Authored: Wed Aug 21 15:36:15 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Aug 21 15:36:15 2013 -0500

--
 CHANGES.txt |  3 +++
 .../apache/cassandra/db/compaction/LeveledManifest.java | 12 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c43a59cc/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
index 7a0a927,597b851..e46c060
--- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
@@@ -457,13 -457,13 +457,13 @@@ public class LeveledManifes
  // if the overlapping ones are already busy in a compaction, 
leave it out.
  // TODO try to find a set of L0 sstables that only overlaps 
with non-busy L1 sstables
  candidates = Sets.union(candidates, overlapping(candidates, 
generations[1]));
- // check overlap with L0 compacting sstables to make sure we 
are not generating overlap in L1.
- IterableSSTableReader compactingL0 = 
Iterables.filter(generations[0], Predicates.in(compacting));
- if (!Sets.intersection(candidates, compacting).isEmpty() || 
!overlapping(candidates, compactingL0).isEmpty())
- return Collections.emptyList();
  }
- 
- return candidates.size()  1 ? candidates : 
Collections.SSTableReaderemptyList();
+ // check overlap with L0 compacting sstables to make sure we are 
not generating overlap in L1.
+ IterableSSTableReader compactingL0 = 
Iterables.filter(generations[0], Predicates.in(compacting));
 -if (candidates.size()  2 || !Sets.intersection(candidates, 
compacting).isEmpty() || !overlapping(candidates, compactingL0).isEmpty())
++if (candidates.size()  2 || !overlapping(candidates, 
compactingL0).isEmpty())
+ return Collections.emptyList();
+ else
+ return candidates;
  }
  
  // for non-L0 compactions, pick up where we left off last time

[10/10] git commit: Merge branch 'cassandra-2.0' into trunk

2013-08-21 Thread yukim 
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 8079401c65e14e6796f58d4f876cb42b15ff2913
Parents: c43a59c 0d769b9
Author: Yuki Morishita yu...@apache.org
Authored: Wed Aug 21 15:43:12 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Aug 21 15:43:12 2013 -0500

--

--

[10/10] git commit: Merge branch 'cassandra-2.0' into trunk

2013-08-19 Thread jbellis 
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 88a390064425171c617b66280a0a5961b234599b
Parents: 883ed60 83feb94
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 19 18:04:31 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 19 18:04:31 2013 -0500

--
 CHANGES.txt | 5 +
 src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 ++
 2 files changed, 7 insertions(+)
--


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

[10/10] git commit: Merge branch 'cassandra-2.0' into trunk

2013-08-09 Thread yukim 
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 5058981350385ba94dcf453b4a4f300b80658f04
Parents: 1b750ad e08d3e2
Author: Yuki Morishita yu...@apache.org
Authored: Fri Aug 9 14:35:52 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Fri Aug 9 14:35:52 2013 -0500

--
 CHANGES.txt |  1 +
 .../db/compaction/CompactionController.java |  2 +-
 .../cassandra/io/sstable/SSTableReader.java | 36 ++--
 .../cassandra/metrics/ColumnFamilyMetrics.java  | 21 
 .../apache/cassandra/service/CacheService.java  |  2 +-
 5 files changed, 58 insertions(+), 4 deletions(-)
--

[10/10] git commit: Merge branch 'cassandra-2.0' into trunk

2013-08-08 Thread brandonwilliams 
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: ac62453649e1b47ec5a8c8d0a13687c9d7d2c481
Parents: 93f838d 988aa31
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Aug 8 13:02:01 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Aug 8 13:02:01 2013 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)
--