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

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

Conflicts:
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java


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

Branch: refs/heads/trunk
Commit: aac421aaa1d2cf214839eedd55abf35958ae4487
Parents: f007a35 b0e4f00
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Feb 12 02:05:16 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Feb 12 02:05:16 2014 +0300

--
 CHANGES.txt |  3 +++
 .../cql3/statements/ModificationStatement.java  | 12 +---
 2 files changed, 12 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aac421aa/CHANGES.txt
--
diff --cc CHANGES.txt
index eec6296,aec6f5e..8e7e249
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,3 +1,37 @@@
 +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)
 + * Replace UnsortedColumns and TreeMapBackedSortedColumns with rewritten
 +   ArrayBackedSortedColumns (CASSANDRA-6630, CASSANDRA-6662)
 + * Add option to use row cache with a given amount of rows (CASSANDRA-5357)
 + * Avoid repairing already repaired data (CASSANDRA-5351)
++ * Reject counter updates with USING TTL/TIMESTAMP (CASSANDRA-6649)
++
 +
  2.0.6
   * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
   * Fix EstimatedHistogram races (CASSANDRA-6682)
@@@ -45,8 -16,8 +47,9 @@@ Merged from 1.2
   * Fix partition and range deletes not triggering flush (CASSANDRA-6655)
   * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667)
   * Compact hints after partial replay to clean out tombstones (CASSANDRA-)
+  * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649)
  
 +
  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/aac421aa/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--
diff --cc 
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index 3775bde,676286c..6d18f1b
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@@ -126,7 -131,26 +126,13 @@@ public abstract class ModificationState
  public void validate(ClientState state) throws InvalidRequestException
  {
  if (hasConditions()  attrs.isTimestampSet())
--throw new InvalidRequestException(Custom timestamps are not 
allowed when conditions are used);
++throw new InvalidRequestException(Cannot provide custom 
timestamp for conditional updates);
+ 
 -if (isCounter())
 -{
 -if (attrs.isTimestampSet()  !loggedCounterTimestamp)
 -{
 -logger.warn(Detected use of 'USING TIMESTAMP' in a counter 
UPDATE. This is invalid  +
 -because counters do not

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

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

Branch: refs/heads/trunk
Commit: afd6368745d6ac4bc43e70cc1c4b47ce59f754e7
Parents: aac421a c5f225b
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Feb 11 17:14:01 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Feb 11 17:14:01 2014 -0600

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/service/StorageService.java| 12 
 2 files changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd63687/CHANGES.txt
--
diff --cc CHANGES.txt
index 8e7e249,fd640cd..1025510
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -42,7 -9,10 +42,8 @@@
   * Correctly handle null with IF conditions and TTL (CASSANDRA-6623)
   * Account for range/row tombstones in tombstone drop
 time histogram (CASSANDRA-6522)
 - * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652)
 - * Make commitlog failure handling configurable (CASSANDRA-6364)
  Merged from 1.2:
+  * Fix broken streams when replacing with same IP (CASSANDRA-6622)
   * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
   * Fix partition and range deletes not triggering flush (CASSANDRA-6655)
   * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667)

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

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

2014-02-11 Thread brandonwilliams 
Merge branch 'cassandra-2.0' 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/67101c29
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67101c29
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67101c29

Branch: refs/heads/trunk
Commit: 67101c29c95984e4e34d5a7c5d71246ad79da2bc
Parents: afd6368 80cebec
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Feb 11 17:15:27 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Feb 11 17:15:27 2014 -0600

--

--

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

2014-02-05 Thread slebresne 
Merge branch 'cassandra-2.0' 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/58d1a4f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58d1a4f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58d1a4f8

Branch: refs/heads/trunk
Commit: 58d1a4f816251a889f3eb4eed801dc8b0ccfc42d
Parents: c004f9f 49bb972
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Feb 5 16:38:18 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Feb 5 16:38:18 2014 +0100

--
 CHANGES.txt  |  5 +
 NEWS.txt | 13 +++--
 doc/cql3/CQL.textile |  4 +---
 3 files changed, 9 insertions(+), 13 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/58d1a4f8/NEWS.txt
--
diff --cc NEWS.txt
index 185f60c,b18150f..9dd2ad6
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,47 -13,7 +13,37 @@@ 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 be customized with the
 + cold_reads_to_omit compaction option; 0.0 omits nothing (the old
 + behavior) and 1.0 omits everything.
 +   - Multithreaded compaction has been removed.
 +   - Counters implementation has been changed, replaced by a safer one with
 + less caveats, but different performance characteristics. You might have
 + to change your data model to accomodate the new implementation.
 + (See https://issues.apache.org/jira/browse/CASSANDRA-6504 and the dev
 + blog post at http://www.datastax.com/dev/blog/PLACEHOLDER for details).
  
- 2.0.6
- =
- 
- New features
- 
- - Scrub can now optionally skip corrupt counter partitions. Please note
-   that this will lead to the loss of all the counter updates in the 
skipped
-   partition. See the --skip-corrupted option.
- 
- 
  2.0.5
  =
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/58d1a4f8/doc/cql3/CQL.textile
--

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

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

Branch: refs/heads/trunk
Commit: 4e9d1aca0449e68b6e2a31ffac0a7b384915d22c
Parents: f642835 24af352
Author: Jason Brown jasedbr...@gmail.com
Authored: Fri Jan 17 15:13:48 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Fri Jan 17 15:13:48 2014 -0800

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


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

[5/5] 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/8ebeee10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ebeee10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ebeee10

Branch: refs/heads/trunk
Commit: 8ebeee104bc985ab6dd7515851747cbd93e898b2
Parents: 82b086f 2bfaf8f
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Jan 10 13:53:43 2014 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Jan 10 13:53:43 2014 -0600

--

--

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

2013-12-20 Thread aleksey 
Merge branch 'cassandra-2.0' into trunk

Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java


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

Branch: refs/heads/trunk
Commit: ed6584ee1609aaac3702f1f20fe694e0565e8571
Parents: 0d695d4 9c17189
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Dec 20 20:19:43 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Dec 20 20:19:43 2013 +0300

--
 .../org/apache/cassandra/cql3/CQLStatement.java |  2 +-
 .../apache/cassandra/cql3/QueryProcessor.java   | 20 ++--
 .../statements/AuthenticationStatement.java |  2 +-
 .../cql3/statements/AuthorizationStatement.java |  2 +-
 .../cql3/statements/BatchStatement.java |  4 ++--
 .../cql3/statements/ModificationStatement.java  |  4 ++--
 .../cql3/statements/ParsedStatement.java|  2 +-
 .../statements/SchemaAlteringStatement.java |  2 +-
 .../cql3/statements/SelectStatement.java|  4 ++--
 .../cql3/statements/TruncateStatement.java  |  2 +-
 .../cassandra/cql3/statements/UseStatement.java |  2 +-
 .../cassandra/thrift/CassandraServer.java   |  2 +-
 .../transport/messages/BatchMessage.java|  5 ++---
 13 files changed, 26 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed6584ee/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed6584ee/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--
diff --cc 
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index 2574f73,9e0fd62..a396ef4
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@@ -72,9 -70,9 +72,9 @@@ public abstract class ModificationState
  }
  
  public abstract boolean requireFullClusteringKey();
 -public abstract ColumnFamily updateForKey(ByteBuffer key, 
ColumnNameBuilder builder, UpdateParameters params) throws 
InvalidRequestException;
 +public abstract ColumnFamily updateForKey(ByteBuffer key, Composite 
prefix, UpdateParameters params) throws InvalidRequestException;
  
- public int getBoundsTerms()
+ public int getBoundTerms()
  {
  return boundTerms;
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed6584ee/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index b29a044,133444a..b3f10c6
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -112,10 -112,10 +112,10 @@@ public class SelectStatement implement
  
  public long measureForPreparedCache(MemoryMeter meter)
  {
 -return meter.measureDeep(this) - meter.measureDeep(cfDef);
 +return meter.measureDeep(this) - meter.measureDeep(cfm);
  }
  
- public int getBoundsTerms()
+ public int getBoundTerms()
  {
  return boundTerms;
  }
@@@ -1027,7 -1067,9 +1027,7 @@@
  {
  CFMetaData cfm = 
ThriftValidation.validateColumnFamily(keyspace(), columnFamily());
  
- VariableSpecifications names = getBoundsVariables();
 -CFDefinition cfDef = cfm.getCfDef();
 -
+ VariableSpecifications names = getBoundVariables();
  
  // Select clause
  if (parameters.isCount  !selectClause.isEmpty())

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

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

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

Branch: refs/heads/trunk
Commit: 6635cde3a0eb6fa2e0599aa9d970596a8664cd63
Parents: 90e585d 53af91e
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Dec 17 16:38:46 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Dec 17 16:38:46 2013 -0600

--
 CHANGES.txt |  1 +
 .../apache/cassandra/net/MessagingService.java  | 50 +---
 2 files changed, 24 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6635cde3/CHANGES.txt
--
diff --cc CHANGES.txt
index 6c9f2e1,b8757d7..1c88431
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 +2.1
 + * 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)
 + * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
 + * Push composites support in the storage engine (CASSANDRA-5417)
 +
 +
  2.0.4
+  * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
   * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
   * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
   * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6635cde3/src/java/org/apache/cassandra/net/MessagingService.java
--

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

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

Branch: refs/heads/trunk
Commit: c41eedf22f594f30ad53abaa1dfc84908d4b0ad9
Parents: b92c55e 6fe83cd
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Nov 14 18:49:09 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Nov 14 18:49:09 2013 +0100

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/cli/CliClient.java| 4 ++--
 src/java/org/apache/cassandra/cql3/Operation.java   | 2 +-
 src/java/org/apache/cassandra/db/marshal/CompositeType.java | 8 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c41eedf2/src/java/org/apache/cassandra/cli/CliClient.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c41eedf2/src/java/org/apache/cassandra/cql3/Operation.java
--

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

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

2013-11-12 Thread slebresne 
Merge branch 'cassandra-2.0' into trunk

Conflicts:
src/java/org/apache/cassandra/tools/SSTableImport.java


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

Branch: refs/heads/trunk
Commit: bfd0144a189c4326c987d91cc20e66e47236dc1a
Parents: 9a59d25 acea716
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Nov 12 19:23:12 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Nov 12 19:23:12 2013 +0100

--
 CHANGES.txt|  3 +++
 .../cassandra/cql3/statements/SelectStatement.java |  2 +-
 .../apache/cassandra/db/marshal/CompositeType.java |  6 +++---
 .../org/apache/cassandra/tools/SSTableImport.java  | 17 ++---
 4 files changed, 21 insertions(+), 7 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfd0144a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfd0144a/src/java/org/apache/cassandra/tools/SSTableImport.java
--
diff --cc src/java/org/apache/cassandra/tools/SSTableImport.java
index 2e9c4ed,0e8172b..3dcb851
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@@ -44,8 -44,9 +44,9 @@@ import org.apache.cassandra.config.Sche
  import org.apache.cassandra.db.marshal.AbstractType;
  import org.apache.cassandra.db.marshal.BytesType;
  import org.apache.cassandra.db.marshal.CompositeType;
 -import org.apache.cassandra.db.marshal.MarshalException;
  import org.apache.cassandra.dht.IPartitioner;
  import org.apache.cassandra.io.sstable.SSTableWriter;
++import org.apache.cassandra.serializers.MarshalException;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.codehaus.jackson.JsonFactory;
  import org.codehaus.jackson.JsonParser;
@@@ -151,8 -152,19 +152,18 @@@ public class SSTableImpor
  }
  }
  
- value = isDeleted() ? ByteBufferUtil.hexToBytes((String) 
fields.get(1))
- : stringAsType((String) fields.get(1), 
meta.getValueValidator(meta.getColumnDefinitionFromCellName(name)));
+ if (isDeleted())
+ {
+ value = ByteBufferUtil.hexToBytes((String) fields.get(1));
+ }
+ else if (isRangeTombstone())
+ {
 -AbstractType? type = 
CompositeType.getInstance(Arrays.asList(new 
AbstractType?[]{meta.getColumnDefinitionComparator(0)}));
 -value = type.fromString((String)fields.get(1));
++value = comparator.fromString((String)fields.get(1));
+ }
+ else
+ {
 -value = stringAsType((String) fields.get(1), 
meta.getValueValidator(meta.getColumnDefinitionFromColumnName(name)));
++value = stringAsType((String) fields.get(1), 
meta.getValueValidator(meta.getColumnDefinitionFromCellName(name)));
+ }
  }
  }

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

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

Branch: refs/heads/trunk
Commit: cfcc57577d43e039562a8b3035b1b9e5b544a7ee
Parents: 5942afa 322f9a9
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Oct 23 16:17:16 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Oct 23 16:17:16 2013 +0200

--
 CHANGES.txt |   4 +-
 .../apache/cassandra/db/RangeTombstoneList.java | 226 ---
 .../org/apache/cassandra/transport/CBUtil.java  |   2 +-
 .../transport/messages/StartupMessage.java  |  11 +-
 .../cassandra/db/RangeTombstoneListTest.java|  31 ++-
 5 files changed, 136 insertions(+), 138 deletions(-)
--


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

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

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

Branch: refs/heads/trunk
Commit: 0b0c9e419e46beb8f620fd4970cb7c482fd63d23
Parents: d32f1eb 72f47a4
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sun Oct 20 21:59:05 2013 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sun Oct 20 21:59:05 2013 -0400

--
 src/java/org/apache/cassandra/cli/CliMain.java | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)
--

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

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

Branch: refs/heads/trunk
Commit: 8e0aa710d704316b8fd01c27da0b48ae45447c4a
Parents: 3017dd3 ff5db56
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Oct 18 11:12:12 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Oct 18 11:12:12 2013 -0500

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


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

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

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

Branch: refs/heads/trunk
Commit: 10c60f5ad6bbf56effa9b7f5f7ef42de317b408d
Parents: 6c37934 cfa0e58
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Fri Oct 18 21:55:08 2013 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Fri Oct 18 21:55:08 2013 -0400

--
 NEWS.txt | 15 ++-
 .../org/apache/cassandra/service/StorageService.java | 12 ++--
 2 files changed, 16 insertions(+), 11 deletions(-)
--


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

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

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

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

Branch: refs/heads/trunk
Commit: b89cce9c8583d869cb3ca6fd26b4a9b47d71f108
Parents: bc8e247 e5dba3c
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Oct 11 17:41:45 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Oct 11 17:41:45 2013 -0500

--

--

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

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

Branch: refs/heads/trunk
Commit: 3da10f469d6a328bad209d723a5997c932284344
Parents: 889da51 56b0e7b
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Oct 4 16:36:36 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Oct 4 16:36:36 2013 -0500

--
 src/java/org/apache/cassandra/service/StorageProxy.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


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

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

2013-09-20 Thread aleksey 
Merge branch 'cassandra-2.0' into trunk

Conflicts:
NEWS.txt
build.xml


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

Branch: refs/heads/trunk
Commit: 4fb090481d508aa9c1c18d79cd012702dfc8f45f
Parents: 3093241 0d976a8
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Sep 20 19:49:00 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Sep 20 19:49:00 2013 +0300

--
 NEWS.txt|  4 ++-
 debian/changelog|  6 
 src/java/org/apache/cassandra/cql3/Cql.g|  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  2 +-
 .../org/apache/cassandra/db/DataTracker.java| 30 
 .../db/compaction/LeveledManifest.java  |  8 +++---
 .../SSTableListChangedNotification.java |  8 --
 7 files changed, 32 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fb09048/NEWS.txt
--
diff --cc NEWS.txt
index 8990769,fc257f4..a7576d2
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,18 -13,7 +13,20 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
++
 +2.1
 +===
++
 +Upgrading
 +-
 +   - Rolling upgrades from anything pre-2.0 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.
 +
 +
- 2.0.2
+ 2.0.1
  =
  
  Upgrading

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fb09048/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
index 2d5aa27,82aa2d6..23f842d
--- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
@@@ -125,12 -127,12 +125,12 @@@ public class LeveledManifes
  return newLevel;
  }
  
- public synchronized void replace(IterableSSTableReader removed, 
IterableSSTableReader added)
+ public synchronized void replace(CollectionSSTableReader removed, 
CollectionSSTableReader added)
  {
- assert !Iterables.isEmpty(removed); // use add() instead of promote 
when adding new sstables
+ assert !removed.isEmpty(); // use add() instead of promote when 
adding new sstables
  logDistribution();
  if (logger.isDebugEnabled())
 -logger.debug(Replacing [ + toString(removed) + ]);
 +logger.debug(Replacing [{}], toString(removed));
  
  // the level for the added sstables is the max of the removed ones,
  // plus one if the removed were all on the same level

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

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

Branch: refs/heads/trunk
Commit: 54f41a9f58414dbb595554ff5b2aa4b98cb7c3ec
Parents: 0cec93c a0abadf
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Sep 19 12:37:17 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Sep 19 12:37:17 2013 +0200

--
 CHANGES.txt |  2 ++
 .../org/apache/cassandra/config/CFMetaData.java | 15 ++-
 .../cassandra/cql3/statements/Restriction.java  | 16 
 .../cassandra/cql3/statements/SelectStatement.java  |  7 ++-
 .../org/apache/cassandra/tools/SSTableImport.java   |  7 ++-
 5 files changed, 44 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/54f41a9f/src/java/org/apache/cassandra/config/CFMetaData.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/54f41a9f/src/java/org/apache/cassandra/cql3/statements/Restriction.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/54f41a9f/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--

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

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

Branch: refs/heads/trunk
Commit: 241f7a4559f4846d0ea31a3c968dfdd75cea8195
Parents: 3b8690d 04cd81c
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Sep 9 23:11:21 2013 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Sep 9 23:11:21 2013 +0100

--
 .../org/apache/cassandra/service/StorageProxy.java  | 13 +++--
 .../apache/cassandra/service/paxos/PaxosState.java  | 16 +---
 2 files changed, 20 insertions(+), 9 deletions(-)
--

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

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

Branch: refs/heads/trunk
Commit: e01186c21129d74432355d4262a9c490e6d54dbe
Parents: 5ea3b15 31f6ec1
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Sep 3 12:12:57 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Sep 3 12:12:57 2013 -0500

--
 CHANGES.txt | 14 +++
 .../config/YamlConfigurationLoader.java | 43 ++--
 2 files changed, 46 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e01186c2/CHANGES.txt
--
diff --cc CHANGES.txt
index 02cb4bc,c09ba86..69cb2e6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +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)
 +
  2.0.1
+  * Improve error message when yaml contains invalid properties 
(CASSANDRA-5958)
   * Improve leveled compaction's ability to find non-overlapping L0 compactions
 to work on concurrently (CASSANDRA-5921)
   * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)

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

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

Branch: refs/heads/trunk
Commit: 8bc0f59904a25aee72168104a88596419b3e9b2e
Parents: d24e900 05929c0
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Aug 22 10:18:51 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Aug 22 10:18:51 2013 +0200

--
 CHANGES.txt |   2 +
 NEWS.txt|   1 +
 bin/sstablesplit|  50 
 debian/cassandra.install|   1 +
 .../cassandra/db/compaction/CompactionTask.java |  14 +-
 .../db/compaction/SSTableSplitter.java  | 105 
 .../cassandra/tools/StandaloneSplitter.java | 256 +++
 7 files changed, 427 insertions(+), 2 deletions(-)
--


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

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

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

Branch: refs/heads/trunk
Commit: 43105f7f16395c20e11b3a1c036308ee293abe60
Parents: 7678661 bfb0647
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Aug 21 18:52:00 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Aug 21 18:52:00 2013 +0300

--
 CHANGES.txt | 10 ++
 src/java/org/apache/cassandra/cql3/Cql.g| 37 +---
 .../apache/cassandra/cql3/QueryProcessor.java   |  9 ++---
 3 files changed, 23 insertions(+), 33 deletions(-)
--


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

[5/5] 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/99b50404
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99b50404
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99b50404

Branch: refs/heads/trunk
Commit: 99b5040403af55e16ff37f9e50f5e6d5352de32e
Parents: 751b1e1 37a6792
Author: Dave Brosius dbros...@apache.org
Authored: Wed Aug 21 20:52:39 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Wed Aug 21 20:52:39 2013 -0400

--
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/99b50404/build.xml
--
diff --cc build.xml
index d153882,4fc9817..33e4f51
--- a/build.xml
+++ b/build.xml
@@@ -354,10 -353,8 +354,10 @@@
dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.5/
 - dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.0/
 +dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.0
 +  exclusion groupId=org.slf4j artifactId=slf4j-log4j12/
 +  /dependency
-   dependency groupId=org.yaml artifactId=snakeyaml 
version=1.6/
+   dependency groupId=org.yaml artifactId=snakeyaml 
version=1.11/
dependency groupId=org.apache.thrift artifactId=libthrift 
version=0.9.0/
  
dependency groupId=junit artifactId=junit version=4.6 /

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

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

Branch: refs/heads/trunk
Commit: 883ed60ef40c875b0e83a58c825a5e1bcc6d3c81
Parents: 8de7c1f dc2c0e7
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 19 17:21:50 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 19 17:21:50 2013 +0200

--
 build.xml   |  2 +-
 conf/cassandra.yaml | 12 
 debian/changelog|  8 +++-
 3 files changed, 16 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/883ed60e/build.xml
--

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

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

Branch: refs/heads/trunk
Commit: 8f243a912362fb5e1e960150bcf5ebee5d5b149b
Parents: e890b1f bc12d73
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Aug 15 15:17:22 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Aug 15 15:17:22 2013 -0500

--
 CHANGES.txt |   3 +
 .../db/compaction/CompactionManager.java|  58 ++
 .../org/apache/cassandra/dht/IPartitioner.java  |   3 +-
 .../cassandra/io/sstable/SSTableReader.java |  44 +++-
 .../apache/cassandra/io/util/SegmentedFile.java |   2 +-
 .../db/compaction/CompactionsTest.java  | 112 +++
 6 files changed, 216 insertions(+), 6 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f243a91/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--

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

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

Branch: refs/heads/trunk
Commit: 0dd3438ac1eaae0e62bcebf7b13f56707dfc5cda
Parents: 8f243a9 69397ef
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Aug 16 05:06:22 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Aug 16 05:06:22 2013 +0300

--
 src/java/org/apache/cassandra/auth/Auth.java | 3 +++
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 +++
 2 files changed, 6 insertions(+)
--