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

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


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

Branch: refs/heads/trunk
Commit: 9e2961964e8b6129ff03fd066951fcad3be12742
Parents: b362aeb 9dc4c16
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Aug 21 12:31:42 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Aug 21 12:31:42 2013 -0500

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

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

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


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

Branch: refs/heads/trunk
Commit: d6e0ca043de2f64bda10470acf12c9d627b206fe
Parents: 9e29619 7d3eef8
Author: Yuki Morishita yu...@apache.org
Authored: Wed Aug 21 15:35:19 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Aug 21 15:35:19 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/d6e0ca04/CHANGES.txt
--

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

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


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

Branch: refs/heads/trunk
Commit: 0d769b97dad1c8cd508a8d0026f929699aa2baee
Parents: d6e0ca0 72a702a
Author: Yuki Morishita yu...@apache.org
Authored: Wed Aug 21 15:41:22 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Aug 21 15:41:22 2013 -0500

--
 lib/licenses/metrics-core-2.0.3.txt | 202 +++
 1 file changed, 202 insertions(+)
--

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

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


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

Branch: refs/heads/trunk
Commit: e08d3e2adcf93c45e5e8e38ab12b11bea2b42a92
Parents: 8c94eb2 d62382b
Author: Yuki Morishita yu...@apache.org
Authored: Fri Aug 9 14:35:45 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Fri Aug 9 14:35:45 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(-)
--


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

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

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


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

Branch: refs/heads/trunk
Commit: 988aa31631f59f2949cde68e4ffd9ddbe24fabe3
Parents: c526131 8ee09f7
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Aug 8 13:01:51 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Aug 8 13:01:51 2013 -0500

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