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

2014-02-03 Thread aleksey 
Merge branch 'cassandra-2.0' into trunk

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/tools/NodeCmd.java
src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml


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

Branch: refs/heads/trunk
Commit: 63f110b5e058217c1d7e3d178b367b918ca2f856
Parents: fc91071 728c4fa
Author: Aleksey Yeschenko 
Authored: Mon Feb 3 23:32:23 2014 +0300
Committer: Aleksey Yeschenko 
Committed: Mon Feb 3 23:32:23 2014 +0300

--
 CHANGES.txt |  4 +
 NEWS.txt| 12 ++-
 .../apache/cassandra/db/ColumnFamilyStore.java  |  4 +-
 .../db/compaction/CompactionManager.java| 12 +--
 .../cassandra/db/compaction/Scrubber.java   | 37 ++---
 .../cassandra/service/StorageService.java   |  4 +-
 .../cassandra/service/StorageServiceMBean.java  |  2 +-
 .../org/apache/cassandra/tools/NodeProbe.java   |  4 +-
 .../org/apache/cassandra/tools/NodeTool.java| 11 ++-
 .../cassandra/tools/StandaloneScrubber.java |  6 +-
 .../unit/org/apache/cassandra/db/ScrubTest.java | 81 ++--
 11 files changed, 141 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/63f110b5/CHANGES.txt
--
diff --cc CHANGES.txt
index 6ca163a,a1a58a3..f9da65c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,7 +1,36 @@@
 +2.1
 + * add listsnapshots command to nodetool (CASSANDRA-5742)
 + * Introduce AtomicBTreeColumns (CASSANDRA-6271)
 + * Multithreaded commitlog (CASSANDRA-3578)
 + * allocate fixed index summary memory pool and resample cold index summaries 
 +   to use less memory (CASSANDRA-5519)
 + * Removed multithreaded compaction (CASSANDRA-6142)
 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
 + * 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)
 + * Remove CFDefinition (CASSANDRA-6253)
 + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
 + * User-defined types for CQL3 (CASSANDRA-5590)
 + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
 + * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
 + * Secondary index support for collections (CASSANDRA-4511, 6383)
 + * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
 + * Push composites support in the storage engine
 +   (CASSANDRA-5417, CASSANDRA-6520)
 + * Add snapshot space used to cfstats (CASSANDRA-6231)
 + * Add cardinality estimator for key count estimation (CASSANDRA-5906)
 + * CF id is changed to be non-deterministic. Data dir/key cache are created
 +   uniquely for CF id (CASSANDRA-5202)
 + * New counters implementation (CASSANDRA-6504)
 +
 +
+ 2.0.6
+  * Let scrub optionally skip broken counter partitions (CASSANDRA-5930)
+ 
+ 
  2.0.5
   * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609)
   * Add ks.cf names to tombstone logging (CASSANDRA-6597)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/63f110b5/NEWS.txt
--
diff --cc NEWS.txt
index 72b898e,b21fbaa..185f60c
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,37 -13,17 +13,47 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +2.1
 +===
 +
 +New features
 +
 +   - SSTable data directory name is slightly changed. Each directory will
 + have hex string appended after CF name, e.g.
 + ks/cf-5be396077b811e3a3ab9dc4b9ac088d/
 + This hex string part represents unique ColumnFamily ID.
 + Note that existing directories are used as is, so only newly created
 + directories after upgrade have new directory name format.
 +   - Saved key cache files also have ColumnFamily ID in their file name.
 +
 +Upgrading
 +-
 +   - Rolling upgrades from anything pre-2.0.5 is not supported.
 +   - For leveled compaction users, 2.0 must be atleast started before
 + upgrading to 2.1 due to the fact that the old JSON leveled
 + manifest is migrated into the sstable metadata files on startup
 + in 2.0 and this code is gone from 2.1.
 +   - For size-tiered compaction users, Cassandra now defaults to ignoring
 + the coldest 5% of sstables.  This can

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

2014-01-30 Thread slebresne 
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/b5a3303f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5a3303f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5a3303f

Branch: refs/heads/trunk
Commit: b5a3303f354492b38a74dea3b49d8e916007ed58
Parents: b1cb582 81fcc33
Author: Sylvain Lebresne 
Authored: Thu Jan 30 18:21:53 2014 +0100
Committer: Sylvain Lebresne 
Committed: Thu Jan 30 18:21:53 2014 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/io/sstable/SSTableScanner.java|  6 
 .../io/sstable/SSTableScannerTest.java  | 30 
 3 files changed, 37 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5a3303f/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5a3303f/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java
--

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

2014-01-19 Thread slebresne 
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/8e1000f6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e1000f6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e1000f6

Branch: refs/heads/trunk
Commit: 8e1000f602e855faeb62b73eadc2dd597360ae8e
Parents: 6aaa023 e9a57fb
Author: Sylvain Lebresne 
Authored: Sun Jan 19 19:38:24 2014 -0800
Committer: Sylvain Lebresne 
Committed: Sun Jan 19 19:38:24 2014 -0800

--
 CHANGES.txt|  1 +
 .../apache/cassandra/db/marshal/CompositeType.java | 17 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e1000f6/src/java/org/apache/cassandra/db/marshal/CompositeType.java
--

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

2014-01-16 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/6947e19c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6947e19c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6947e19c

Branch: refs/heads/trunk
Commit: 6947e19ca69a02d2b56951e9add0c4d13a990a00
Parents: a0fb58f 07f85b1
Author: Brandon Williams 
Authored: Thu Jan 16 15:10:15 2014 -0600
Committer: Brandon Williams 
Committed: Thu Jan 16 15:10:15 2014 -0600

--
 .../apache/cassandra/service/StorageService.java  | 18 --
 1 file changed, 16 insertions(+), 2 deletions(-)
--


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

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

2014-01-10 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/82b086f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82b086f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82b086f4

Branch: refs/heads/trunk
Commit: 82b086f478d1979e2776fdb724c228a19a9de05b
Parents: ebc712a e2209d5
Author: Brandon Williams 
Authored: Fri Jan 10 13:52:43 2014 -0600
Committer: Brandon Williams 
Committed: Fri Jan 10 13:52:43 2014 -0600

--

--

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

2013-12-17 Thread jasobrown 
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/216139ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/216139ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/216139ff

Branch: refs/heads/trunk
Commit: 216139ff69dbd83907b3cd20d9c0f223135d10f5
Parents: 6e6730d 09c7dee
Author: Jason Brown 
Authored: Tue Dec 17 11:06:01 2013 -0800
Committer: Jason Brown 
Committed: Tue Dec 17 11:06:01 2013 -0800

--
 doc/native_protocol_v1.spec | 2 +-
 doc/native_protocol_v2.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--

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

2013-12-12 Thread aleksey 
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/56e48423
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56e48423
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56e48423

Branch: refs/heads/trunk
Commit: 56e4842321a1158be2f1f738205c56c6e5b82d73
Parents: 706058c f5526d5
Author: Aleksey Yeschenko 
Authored: Thu Dec 12 20:57:09 2013 +0300
Committer: Aleksey Yeschenko 
Committed: Thu Dec 12 20:57:09 2013 +0300

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/56e48423/src/java/org/apache/cassandra/service/StorageProxy.java
--

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

2013-12-03 Thread slebresne 
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/b34d43f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b34d43f9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b34d43f9

Branch: refs/heads/trunk
Commit: b34d43f9747d2ebc1feb516d9675801bcd293d8b
Parents: d12a0d7 1334f94
Author: Sylvain Lebresne 
Authored: Tue Dec 3 14:57:06 2013 +0100
Committer: Sylvain Lebresne 
Committed: Tue Dec 3 14:57:06 2013 +0100

--
 CHANGES.txt|  1 +
 .../cassandra/db/marshal/CollectionType.java   | 17 +
 .../org/apache/cassandra/db/marshal/ListType.java  |  2 ++
 .../org/apache/cassandra/db/marshal/MapType.java   |  2 ++
 .../org/apache/cassandra/db/marshal/SetType.java   |  2 ++
 5 files changed, 24 insertions(+)
--


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

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

2013-11-20 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/f424e585
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f424e585
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f424e585

Branch: refs/heads/trunk
Commit: f424e585a99769ee7e8768d54c9c170864c1d412
Parents: ff6f04e cb7eb86
Author: Brandon Williams 
Authored: Wed Nov 20 11:58:43 2013 -0600
Committer: Brandon Williams 
Committed: Wed Nov 20 11:58:43 2013 -0600

--
 examples/pig/example-script-cql.pig | 11 ++
 examples/pig/example-script.pig | 14 +
 .../cassandra/pig/CqlTableDataTypeTest.java | 21 
 .../pig/ThriftColumnFamilyDataTypeTest.java | 21 
 4 files changed, 54 insertions(+), 13 deletions(-)
--

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

2013-10-14 Thread brandonwilliams 
Merge branch 'cassandra-2.0' into trunk

Conflicts:
conf/cassandra-env.sh


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

Branch: refs/heads/trunk
Commit: 0b3a0a6177484bff1cc031c123620829a0d29dcb
Parents: 9ef5383 b0b868f
Author: Brandon Williams 
Authored: Mon Oct 14 12:49:16 2013 -0500
Committer: Brandon Williams 
Committed: Mon Oct 14 12:49:16 2013 -0500

--
 conf/cassandra-env.sh | 1 +
 1 file changed, 1 insertion(+)
--

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

2013-10-03 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/db829493
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db829493
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db829493

Branch: refs/heads/trunk
Commit: db8294932d0dfaa3cc354794fee61c5531fbb101
Parents: ec308e6 31a9a2f
Author: Jonathan Ellis 
Authored: Thu Oct 3 09:31:16 2013 -0500
Committer: Jonathan Ellis 
Committed: Thu Oct 3 09:31:16 2013 -0500

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/cql3/Cql.g| 2 +-
 src/java/org/apache/cassandra/tools/BulkLoader.java | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)
--


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

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

2013-10-02 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/87e19fc8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87e19fc8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87e19fc8

Branch: refs/heads/trunk
Commit: 87e19fc8f56e4c5f90be1ca5c5f5037ea50a56c5
Parents: dca300d 76cb10c
Author: Jonathan Ellis 
Authored: Wed Oct 2 16:10:57 2013 -0500
Committer: Jonathan Ellis 
Committed: Wed Oct 2 16:10:57 2013 -0500

--
 src/java/org/apache/cassandra/tracing/Tracing.java | 9 -
 1 file changed, 9 deletions(-)
--

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

2013-09-18 Thread slebresne 
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/7d03e28b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d03e28b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d03e28b

Branch: refs/heads/trunk
Commit: 7d03e28b5cd08fb35482f42322556084441be41d
Parents: 08eb9c8 a7b32de
Author: Sylvain Lebresne 
Authored: Wed Sep 18 14:30:13 2013 +0200
Committer: Sylvain Lebresne 
Committed: Wed Sep 18 14:30:13 2013 +0200

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/cql3/CQL3Type.java   | 2 +-
 .../org/apache/cassandra/service/pager/AbstractQueryPager.java | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
--


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

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

2013-09-14 Thread vijay 
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/fcd0aebb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcd0aebb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fcd0aebb

Branch: refs/heads/trunk
Commit: fcd0aebb6ec6f7bab267cba952f7a03f1c929512
Parents: 2c65393 3bba32c
Author: Vijay Parthasarathy 
Authored: Sat Sep 14 17:47:02 2013 -0700
Committer: Vijay Parthasarathy 
Committed: Sat Sep 14 17:47:02 2013 -0700

--
 NEWS.txt|  2 ++
 conf/commitlog_archiving.properties |  7 +++--
 .../db/commitlog/CommitLogArchiver.java | 12 -
 .../db/commitlog/CommitLogReplayer.java |  2 +-
 test/conf/commitlog_archiving.properties| 19 +
 .../cassandra/db/RecoveryManagerTest.java   | 28 
 6 files changed, 66 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcd0aebb/NEWS.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcd0aebb/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
--

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

2013-09-10 Thread slebresne 
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/972184bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/972184bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/972184bf

Branch: refs/heads/trunk
Commit: 972184bf750c0340f6ca2a13ee39347d173b5e79
Parents: 0132b71 2c84b14
Author: Sylvain Lebresne 
Authored: Wed Sep 11 08:36:21 2013 +0200
Committer: Sylvain Lebresne 
Committed: Wed Sep 11 08:36:21 2013 +0200

--
 CHANGES.txt |  2 ++
 src/java/org/apache/cassandra/cql3/Cql.g|  2 +-
 .../cassandra/cql3/functions/TimeuuidFcts.java  | 24 
 .../cassandra/cql3/functions/TokenFct.java  |  7 +-
 4 files changed, 29 insertions(+), 6 deletions(-)
--


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

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

2013-08-23 Thread aleksey 
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/d7977f2c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7977f2c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7977f2c

Branch: refs/heads/trunk
Commit: d7977f2c4593d593b0ce309dae5501b1ceb51ff7
Parents: 0d94d2a f31c668
Author: Aleksey Yeschenko 
Authored: Sat Aug 24 03:27:35 2013 +0300
Committer: Aleksey Yeschenko 
Committed: Sat Aug 24 03:27:35 2013 +0300

--
 pylib/cqlshlib/cql3handling.py   |  2 +-
 src/java/org/apache/cassandra/cql3/Cql.g | 16 ++--
 2 files changed, 7 insertions(+), 11 deletions(-)
--

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

2013-08-23 Thread aleksey 
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/0d94d2a0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d94d2a0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d94d2a0

Branch: refs/heads/trunk
Commit: 0d94d2a0ac03eaf6dd169fb79db1b7cefb1fecdf
Parents: b224e58 78d78cf
Author: Aleksey Yeschenko 
Authored: Sat Aug 24 02:19:22 2013 +0300
Committer: Aleksey Yeschenko 
Committed: Sat Aug 24 02:19:22 2013 +0300

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 22 ++--
 2 files changed, 17 insertions(+), 6 deletions(-)
--


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

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

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

2013-08-22 Thread dbrosius 
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/239e2d71
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/239e2d71
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/239e2d71

Branch: refs/heads/trunk
Commit: 239e2d7176531730b8480ba9e912d2f3ce1ada90
Parents: 3f5322f ed79c14
Author: Dave Brosius 
Authored: Thu Aug 22 21:19:45 2013 -0400
Committer: Dave Brosius 
Committed: Thu Aug 22 21:19:45 2013 -0400

--
 bin/nodetool | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

2013-08-21 Thread vijay 
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/74492ef2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74492ef2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74492ef2

Branch: refs/heads/trunk
Commit: 74492ef27f084a58d3825c0fabbd06e1c7c6eb60
Parents: 5e33b9b 7b9ae6a
Author: Vijay Parthasarathy 
Authored: Wed Aug 21 19:25:02 2013 -0700
Committer: Vijay Parthasarathy 
Committed: Wed Aug 21 19:25:02 2013 -0700

--
 .../cassandra/utils/obs/OffHeapBitSet.java  |  5 ++-
 .../apache/cassandra/utils/BloomFilterTest.java | 36 
 2 files changed, 40 insertions(+), 1 deletion(-)
--

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

2013-08-21 Thread dbrosius 
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/6f114c93
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f114c93
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f114c93

Branch: refs/heads/trunk
Commit: 6f114c93183af1a14fa49f3a6d10b4a0e9c6c298
Parents: 3407ed3 f3bb823
Author: Dave Brosius 
Authored: Wed Aug 21 21:53:01 2013 -0400
Committer: Dave Brosius 
Committed: Wed Aug 21 21:53:01 2013 -0400

--
 lib/licenses/commons-collections-3.2.1.txt | 202 
 lib/licenses/jetty-6.1.21.txt  | 202 
 lib/licenses/jetty-util-6.1.21.txt | 202 
 3 files changed, 606 deletions(-)
--

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

2013-08-21 Thread slebresne 
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/896e1722
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/896e1722
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/896e1722

Branch: refs/heads/trunk
Commit: 896e1722da7076105ec1b533c25940616b2bd3b3
Parents: 1bb1ffb c4f6be8
Author: Sylvain Lebresne 
Authored: Wed Aug 21 12:16:37 2013 +0200
Committer: Sylvain Lebresne 
Committed: Wed Aug 21 12:16:37 2013 +0200

--
 doc/cql3/CQL.textile | 24 +++-
 1 file changed, 15 insertions(+), 9 deletions(-)
--

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

2013-08-20 Thread vijay 
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/a380cd1d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a380cd1d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a380cd1d

Branch: refs/heads/trunk
Commit: a380cd1d015e35a3144212eaacebd620e7480bd6
Parents: 64c9732 d35c823
Author: Vijay Parthasarathy 
Authored: Tue Aug 20 16:24:55 2013 -0700
Committer: Vijay Parthasarathy 
Committed: Tue Aug 20 16:24:55 2013 -0700

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


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

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

2013-08-20 Thread vijay 
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/64c97327
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64c97327
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64c97327

Branch: refs/heads/trunk
Commit: 64c97327c256679e17bdb208b475d3bc8aaa73ec
Parents: 5ba0b96 4625ba6
Author: Vijay Parthasarathy 
Authored: Tue Aug 20 15:54:46 2013 -0700
Committer: Vijay Parthasarathy 
Committed: Tue Aug 20 15:54:46 2013 -0700

--
 .../org/apache/cassandra/utils/obs/OffHeapBitSet.java| 11 +--
 src/java/org/apache/cassandra/utils/obs/OpenBitSet.java  |  6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)
--

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

2013-08-20 Thread dbrosius 
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/8d2fdf39
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d2fdf39
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d2fdf39

Branch: refs/heads/trunk
Commit: 8d2fdf3993f77f7a7dac87a7ef1374b97b375d94
Parents: 7a46c97 e023897
Author: Dave Brosius 
Authored: Tue Aug 20 17:56:02 2013 -0400
Committer: Dave Brosius 
Committed: Tue Aug 20 17:56:02 2013 -0400

--
 CHANGES.txt| 3 +++
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java| 6 --
 src/java/org/apache/cassandra/service/StorageService.java  | 4 ++--
 src/java/org/apache/cassandra/service/StorageServiceMBean.java | 4 ++--
 src/java/org/apache/cassandra/tools/NodeCmd.java   | 5 -
 src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++--
 6 files changed, 17 insertions(+), 9 deletions(-)
--


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

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d2fdf39/src/java/org/apache/cassandra/service/StorageServiceMBean.java
--

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

2013-08-20 Thread slebresne 
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/7a46c97f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a46c97f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a46c97f

Branch: refs/heads/trunk
Commit: 7a46c97f8e3bf81e3c74f6ee896d0203e35117b3
Parents: 88a3900 fb9b3d5
Author: Sylvain Lebresne 
Authored: Tue Aug 20 16:48:47 2013 +0200
Committer: Sylvain Lebresne 
Committed: Tue Aug 20 16:48:47 2013 +0200

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


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

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

2013-08-17 Thread aleksey 
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/9835a6dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9835a6dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9835a6dd

Branch: refs/heads/trunk
Commit: 9835a6dd2ae02e769761b5b477339359a831b42e
Parents: 0e4bd46 11f0085
Author: Aleksey Yeschenko 
Authored: Sat Aug 17 18:48:31 2013 +0300
Committer: Aleksey Yeschenko 
Committed: Sat Aug 17 18:48:31 2013 +0300

--
 CHANGES.txt |  2 ++
 .../cql3/statements/SelectStatement.java| 32 
 2 files changed, 14 insertions(+), 20 deletions(-)
--


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

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

2013-08-16 Thread aleksey 
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/d8dfa170
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8dfa170
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8dfa170

Branch: refs/heads/trunk
Commit: d8dfa1703486aae634fc7fc553a35cf050e90aa7
Parents: 5dabd1c 62b709f
Author: Aleksey Yeschenko 
Authored: Fri Aug 16 21:51:46 2013 +0300
Committer: Aleksey Yeschenko 
Committed: Fri Aug 16 21:51:46 2013 +0300

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/cql3handling.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

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

2013-08-12 Thread aleksey 
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/c6bf9dcc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6bf9dcc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6bf9dcc

Branch: refs/heads/trunk
Commit: c6bf9dcc8e1147e80621fa09c6d23b1a2ae91d30
Parents: cb349d9 9806b77
Author: Aleksey Yeschenko 
Authored: Mon Aug 12 19:19:56 2013 +0200
Committer: Aleksey Yeschenko 
Committed: Mon Aug 12 19:19:56 2013 +0200

--
 src/java/org/apache/cassandra/config/CFMetaData.java | 10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)
--

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

2013-08-12 Thread aleksey 
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/92cfea55
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92cfea55
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92cfea55

Branch: refs/heads/trunk
Commit: 92cfea5507a876691342d7834c5f1aaf39df8e02
Parents: e718467 e472ba4
Author: Aleksey Yeschenko 
Authored: Mon Aug 12 12:40:41 2013 +0200
Committer: Aleksey Yeschenko 
Committed: Mon Aug 12 12:40:41 2013 +0200

--
 pylib/cqlshlib/cql3handling.py   | 4 
 src/java/org/apache/cassandra/config/CFMetaData.java | 2 --
 2 files changed, 6 deletions(-)
--