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

2014-11-04 Thread jake 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: ee85a31f6fe489b15a9e33d604329d6e7732416a
Parents: 071b8e3 0bc1ea3
Author: T Jake Luciani j...@apache.org
Authored: Tue Nov 4 09:41:55 2014 -0500
Committer: T Jake Luciani j...@apache.org
Committed: Tue Nov 4 09:41:55 2014 -0500

--
 CHANGES.txt |  1 +
 build.xml   | 16 +++-
 .../org/apache/cassandra/cql3/QueryOptions.java |  2 +-
 .../cassandra/cql3/NonNativeTimestampTest.java  | 86 
 4 files changed, 100 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee85a31f/CHANGES.txt
--
diff --cc CHANGES.txt
index 52df09b,8dd2613..08f5cd0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,5 +1,38 @@@
 +3.0
 + * Mark sstables as repaired after full repair (CASSANDRA-7586) 
 + * Extend Descriptor to include a format value and refactor reader/writer 
apis (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 
7781, 7929,
 +   7924, 7812, 8063)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * improve concurrency of repair (CASSANDRA-6455)
 +
 +
  2.1.2
+  * Fix default timestamp in QueryOptions (CASSANDRA-8246)
   * Set socket timeout when reading remote version (CASSANDRA-8188)
   * Refactor how we track live size (CASSANDRA-7852)
   * Make sure unfinished compaction files are removed (CASSANDRA-8124)

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

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

2014-11-04 Thread tylerhobbs 
Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/cql/QueryProcessor.java
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
test/unit/org/apache/cassandra/db/CleanupTest.java
test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java


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

Branch: refs/heads/trunk
Commit: 525ac00c0fca71632fa9bb97b2a8b9e844b9850c
Parents: 72d187c 5117a5d
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Nov 4 10:39:36 2014 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Nov 4 10:39:36 2014 -0600

--
 CHANGES.txt |  2 +
 pylib/cqlshlib/cql3handling.py  |  4 +-
 .../org/apache/cassandra/config/CFMetaData.java |  2 +-
 .../cassandra/config/ColumnDefinition.java  | 12 +++
 .../apache/cassandra/cql3/ColumnCondition.java  | 98 ++--
 src/java/org/apache/cassandra/cql3/Cql.g| 18 ++--
 .../cassandra/cql3/MultiColumnRelation.java | 14 +--
 .../org/apache/cassandra/cql3/Operator.java | 93 +++
 .../org/apache/cassandra/cql3/Relation.java | 45 +
 .../cassandra/cql3/SingleColumnRelation.java| 18 ++--
 .../cql3/statements/CreateIndexStatement.java   |  6 +-
 .../cql3/statements/ModificationStatement.java  |  4 +-
 .../cassandra/cql3/statements/Restriction.java  | 12 ++-
 .../cql3/statements/SelectStatement.java| 53 ++-
 .../statements/SingleColumnRestriction.java | 17 ++--
 .../apache/cassandra/db/IndexExpression.java| 89 ++
 .../apache/cassandra/db/PagedRangeCommand.java  | 10 +-
 .../apache/cassandra/db/RangeSliceCommand.java  | 11 +--
 .../cassandra/db/filter/ExtendedFilter.java | 31 ---
 .../cassandra/db/index/SecondaryIndex.java  | 18 
 .../db/index/SecondaryIndexManager.java |  2 +-
 .../db/index/SecondaryIndexSearcher.java|  7 +-
 .../db/index/composites/CompositesIndex.java|  9 +-
 .../CompositesIndexOnCollectionKey.java |  8 ++
 .../CompositesIndexOnCollectionValue.java   |  7 ++
 .../cassandra/db/marshal/CollectionType.java|  9 ++
 .../cassandra/db/marshal/CompositeType.java |  4 +-
 .../cassandra/thrift/ThriftConversion.java  |  3 +-
 .../cassandra/cql3/ColumnConditionTest.java | 48 +-
 .../cassandra/cql3/ContainsRelationTest.java| 44 +
 .../org/apache/cassandra/db/CleanupTest.java| 11 ++-
 .../cassandra/db/ColumnFamilyStoreTest.java | 47 +-
 .../cassandra/io/sstable/SSTableReaderTest.java |  3 +-
 .../streaming/StreamingTransferTest.java|  3 +-
 34 files changed, 473 insertions(+), 289 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/525ac00c/CHANGES.txt
--
diff --cc CHANGES.txt
index 61d6226,7fb32fe..327bfef
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,6 +1,39 @@@
 +3.0
 + * Mark sstables as repaired after full repair (CASSANDRA-7586) 
 + * Extend Descriptor to include a format value and refactor reader/writer 
apis (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 
7781, 7929,
 +   7924, 7812, 8063)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)

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

2014-11-04 Thread jmckenzie 
Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
src/java/org/apache/cassandra/db/Memtable.java


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

Branch: refs/heads/trunk
Commit: 254cd85a5b89a944a1c6251ff0846cbf03d52bfd
Parents: bd32104 5acc7a9
Author: Joshua McKenzie jmcken...@apache.org
Authored: Tue Nov 4 14:33:44 2014 -0600
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Tue Nov 4 14:33:44 2014 -0600

--
 src/java/org/apache/cassandra/db/AtomicBTreeColumns.java| 9 ++---
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 +++-
 src/java/org/apache/cassandra/db/Memtable.java  | 9 +
 .../org/apache/cassandra/metrics/ColumnFamilyMetrics.java   | 3 +++
 src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java  | 3 +++
 5 files changed, 20 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/254cd85a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
--
diff --cc src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
index 7a98cb9,372ce5c..ec9bb94
--- a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
+++ b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
@@@ -35,10 -35,8 +35,10 @@@ import org.apache.cassandra.config.CFMe
  import org.apache.cassandra.db.composites.CellName;
  import org.apache.cassandra.db.composites.Composite;
  import org.apache.cassandra.db.filter.ColumnSlice;
- import org.apache.cassandra.utils.ObjectSizes;
+ import org.apache.cassandra.utils.*;
 +import org.apache.cassandra.utils.SearchIterator;
  import org.apache.cassandra.utils.btree.BTree;
 +import org.apache.cassandra.utils.btree.BTreeSearchIterator;
  import org.apache.cassandra.utils.btree.UpdateFunction;
  import org.apache.cassandra.utils.concurrent.Locks;
  import org.apache.cassandra.utils.concurrent.OpOrder;

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/254cd85a/src/java/org/apache/cassandra/db/Memtable.java
--
diff --cc src/java/org/apache/cassandra/db/Memtable.java
index 80376f7,ba3864f..21a36b8
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@@ -43,8 -42,8 +43,7 @@@ import org.apache.cassandra.dht.LongTok
  import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
  import org.apache.cassandra.io.util.DiskAwareRunnable;
  import org.apache.cassandra.service.ActiveRepairService;
- import org.apache.cassandra.utils.ByteBufferUtil;
- import org.apache.cassandra.utils.ObjectSizes;
++import org.apache.cassandra.utils.*;
  import org.apache.cassandra.utils.concurrent.OpOrder;
  import org.apache.cassandra.utils.memory.*;
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/254cd85a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/254cd85a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
--

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

2014-10-07 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 17a4fbdaac4562db475272b79c94fa90aa423dd8
Parents: 7f26410 9873960
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Oct 7 18:44:19 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Oct 7 18:44:19 2014 +0300

--
 CHANGES.txt |  4 
 .../cassandra/net/IncomingTcpConnection.java| 21 ++--
 .../apache/cassandra/net/MessagingService.java  |  2 +-
 .../cassandra/net/OutboundTcpConnection.java|  7 +--
 4 files changed, 20 insertions(+), 14 deletions(-)
--


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

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

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

2014-10-02 Thread jmckenzie 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 75c376db87d82de719d94afa0e5a1321cd2b1924
Parents: e68f52b c4c56fa
Author: Joshua McKenzie josh.mcken...@datastax.com
Authored: Thu Oct 2 14:25:19 2014 -0500
Committer: Joshua McKenzie josh.mcken...@datastax.com
Committed: Thu Oct 2 14:25:19 2014 -0500

--
 bin/cassandra.ps1 | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--

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

2014-09-23 Thread jake 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 1ecb7016598d98a54da44845568a65707df3ca9b
Parents: 3f181f0 c2c9835
Author: Jake Luciani j...@apache.org
Authored: Tue Sep 23 12:50:15 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Tue Sep 23 12:50:15 2014 -0400

--
 CHANGES.txt |  2 +
 .../io/compress/CompressionParameters.java  | 13 +++-
 .../cassandra/io/sstable/SSTableReader.java |  6 +-
 .../org/apache/cassandra/cql3/CQLTester.java|  2 +-
 .../cassandra/cql3/CrcCheckChanceTest.java  | 70 
 5 files changed, 90 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ecb7016/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ecb7016/test/unit/org/apache/cassandra/cql3/CQLTester.java
--

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

2014-09-19 Thread tylerhobbs 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 3e305f80980952b0fb9241e97c75728ca55b25be
Parents: bcec4ea c5c0585
Author: Tyler Hobbs ty...@datastax.com
Authored: Fri Sep 19 11:25:43 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Sep 19 11:25:43 2014 -0500

--
 CHANGES.txt |  3 +-
 .../cql3/statements/SelectStatement.java| 22 
 .../cql3/SelectWithTokenFunctionTest.java   | 55 
 3 files changed, 79 insertions(+), 1 deletion(-)
--


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

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

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

2014-09-04 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: befd0b900c2cf894191fe5913aab6603a6b80f4f
Parents: 9b98fec 7650821
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Sep 4 15:05:52 2014 -0400
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Sep 4 15:05:52 2014 -0400

--
 .../org/apache/cassandra/config/CFMetaData.java | 21 
 .../cql3/statements/CreateTableStatement.java   |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)
--


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

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

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

2014-08-28 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 2cc6313b8e3db4caf85606937000678f1a822e67
Parents: b317874 7932119
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Aug 28 16:37:30 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Aug 28 16:37:30 2014 +0300

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/cql3/statements/AlterTableStatement.java| 4 
 2 files changed, 5 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cc6313b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--

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

2014-08-27 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 0d0aed85fe1b520f9390091b74e4e4d4a70b7425
Parents: 2a6e071 44a9d8c
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Aug 27 18:21:02 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Aug 27 18:21:02 2014 +0300

--
 pylib/cqlshlib/helptopics.py | 2 +-
 src/java/org/apache/cassandra/cql3/Operation.java| 4 ++--
 src/java/org/apache/cassandra/cql3/Sets.java | 2 +-
 test/unit/org/apache/cassandra/cql3/CollectionsTest.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d0aed85/pylib/cqlshlib/helptopics.py
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d0aed85/src/java/org/apache/cassandra/cql3/Sets.java
--

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

2014-08-26 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: e471dab3144a23c88656be77608387a467d01abf
Parents: b9e42df 6ce0456
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Aug 26 19:18:19 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Aug 26 19:18:19 2014 +0300

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/CFMetaData.java |  5 +++
 .../org/apache/cassandra/cql3/CQLTester.java|  7 +
 .../apache/cassandra/cql3/CreateTableTest.java  | 32 
 4 files changed, 45 insertions(+)
--


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

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

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

2014-08-20 Thread marcuse 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 060c7961d0a8374f53312a1cf9ea4b78a0e47b9c
Parents: 504d3c5 bd692ba
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Aug 20 08:25:59 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Aug 20 08:25:59 2014 +0200

--
 CHANGES.txt |  2 ++
 .../compress/CompressedInputStream.java | 17 +--
 .../compress/CompressedInputStreamTest.java | 23 +++-
 3 files changed, 35 insertions(+), 7 deletions(-)
--


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

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

2014-08-20 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 7036e39af74db8028afcb9c10e009d979fa4ad65
Parents: 37f5175 fd40a61
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Aug 20 15:51:58 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Aug 20 15:51:58 2014 +0300

--

--

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

2014-08-20 Thread tylerhobbs 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 0f530413ccffd9b9611ce1c5a77c3f3cb7c65372
Parents: c158efd 8d494c7
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Aug 20 11:14:41 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Aug 20 11:14:41 2014 -0500

--
 CHANGES.txt |  4 ++-
 .../cassandra/db/marshal/ReversedType.java  |  9 +
 .../org/apache/cassandra/cql3/CQLTester.java|  7 
 .../org/apache/cassandra/cql3/TypeTest.java | 37 +++-
 4 files changed, 55 insertions(+), 2 deletions(-)
--


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

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

2014-08-19 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 16069c351bde3f0f418021def169a5553abe41e1
Parents: e7d6534 d4ac8d5
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Aug 19 16:20:20 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Aug 19 16:20:20 2014 +0300

--
 CHANGES.txt |  2 +-
 .../db/index/SecondaryIndexManager.java | 28 +---
 2 files changed, 13 insertions(+), 17 deletions(-)
--


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

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

2014-08-18 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 8ce346d7beab67c2a68ae8c93b74e00174c30424
Parents: 9aea917 5549680
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 18 12:24:23 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 18 12:24:23 2014 +0200

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/CFMetaData.java | 42 ++--
 .../cql3/statements/CreateTableStatement.java   |  9 -
 3 files changed, 39 insertions(+), 13 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ce346d7/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
--

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

2014-08-15 Thread jake 
Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/io/util/RandomAccessReader.java


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

Branch: refs/heads/trunk
Commit: fe8829fa6ac5a0775ac041fe5a64d6c47c34961f
Parents: 4dd1a15 54fbb0a
Author: Jake Luciani j...@apache.org
Authored: Fri Aug 15 13:38:56 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Fri Aug 15 13:38:56 2014 -0400

--
 CHANGES.txt |  1 +
 .../cassandra/io/util/RandomAccessReader.java   |  5 +-
 .../io/util/BufferedRandomAccessFileTest.java   | 71 
 3 files changed, 76 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe8829fa/src/java/org/apache/cassandra/io/util/RandomAccessReader.java
--
diff --cc src/java/org/apache/cassandra/io/util/RandomAccessReader.java
index e395510,81e45b5..58205d8
--- a/src/java/org/apache/cassandra/io/util/RandomAccessReader.java
+++ b/src/java/org/apache/cassandra/io/util/RandomAccessReader.java
@@@ -167,7 -154,10 +167,10 @@@ public class RandomAccessReader extend
  
  public int getTotalBufferSize()
  {
- return buffer.capacity();
+ //This may NPE so we make a ref
+ //https://issues.apache.org/jira/browse/CASSANDRA-7756
 -byte[] ref = buffer;
 -return ref != null ? ref.length : 0;
++ByteBuffer ref = buffer;
++return ref != null ? ref.capacity() : 0;
  }
  
  public void reset()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe8829fa/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
--
diff --cc 
test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
index 8053553,cfabf62..7993160
--- a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
+++ b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
@@@ -520,6 -526,70 +526,71 @@@ public class BufferedRandomAccessFileTe
  }
  
  @Test
+ public void testFileCacheService() throws IOException, 
InterruptedException
+ {
+ //see https://issues.apache.org/jira/browse/CASSANDRA-7756
+ 
++final FileCacheService.CacheKey cacheKey = new 
FileCacheService.CacheKey();
+ final int THREAD_COUNT = 40;
+ ExecutorService executorService = 
Executors.newFixedThreadPool(THREAD_COUNT);
+ 
+ SequentialWriter w1 = createTempFile(fscache1);
+ SequentialWriter w2 = createTempFile(fscache2);
+ 
+ w1.write(new byte[30]);
+ w1.close();
+ 
+ w2.write(new byte[30]);
+ w2.close();
+ 
+ for (int i = 0; i  20; i++)
+ {
+ 
+ 
+ RandomAccessReader r1 = RandomAccessReader.open(w1);
+ RandomAccessReader r2 = RandomAccessReader.open(w2);
+ 
+ 
 -FileCacheService.instance.put(r1);
 -FileCacheService.instance.put(r2);
++FileCacheService.instance.put(cacheKey, r1);
++FileCacheService.instance.put(cacheKey, r2);
+ 
+ final CountDownLatch finished = new CountDownLatch(THREAD_COUNT);
+ final AtomicBoolean hadError = new AtomicBoolean(false);
+ 
+ for (int k = 0; k  THREAD_COUNT; k++)
+ {
+ executorService.execute( new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ try
+ {
+ long size = 
FileCacheService.instance.sizeInBytes();
+ 
+ while (size  0)
+ size = 
FileCacheService.instance.sizeInBytes();
+ }
+ catch (Throwable t)
+ {
+ t.printStackTrace();
+ hadError.set(true);
+ }
+ finally
+ {
+ finished.countDown();
+ }
+ }
+ });
+ 
+ }
+ 
+ finished.await();
+ assert !hadError.get();
+ }
+ }
+ 
+ @Test
  public void testReadOnly() throws IOException
  {
  SequentialWriter

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

2014-08-15 Thread benedict 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: fe0572778cd4449d3c3d850931f9d41a454b8994
Parents: ba22af1 8a69ef8
Author: Benedict Elliott Smith bened...@apache.org
Authored: Sat Aug 16 12:17:28 2014 +0700
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Sat Aug 16 12:17:28 2014 +0700

--
 CHANGES.txt |  5 ++
 .../cassandra/streaming/StreamTransferTask.java | 83 
 .../streaming/StreamTransferTaskTest.java   | 17 +++-
 3 files changed, 67 insertions(+), 38 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe057277/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
--
diff --cc test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
index 5d246f4,cc41a8b..16fa77b
--- a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
+++ b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
@@@ -22,11 -24,10 +24,12 @@@ import java.util.concurrent.Future
  import java.util.concurrent.ScheduledFuture;
  import java.util.concurrent.TimeUnit;
  
 +import org.junit.BeforeClass;
  import org.junit.Test;
  
+ import junit.framework.Assert;
  import org.apache.cassandra.SchemaLoader;
 +import org.apache.cassandra.config.KSMetaData;
  import org.apache.cassandra.db.ColumnFamilyStore;
  import org.apache.cassandra.db.Keyspace;
  import org.apache.cassandra.dht.Range;

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

2014-08-14 Thread jake 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 4304b3a6df8e10e7abd998cd79abe330607d38c2
Parents: 048f72b 1040b52
Author: Jake Luciani j...@apache.org
Authored: Thu Aug 14 09:54:22 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Thu Aug 14 09:54:22 2014 -0400

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


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

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

2014-08-13 Thread tylerhobbs 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: a26f19266557be391fe0abd2dc519aec5c571ea7
Parents: 5d2ac2a 6a7235e
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Aug 13 11:35:22 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Aug 13 11:35:22 2014 -0500

--

--

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

2014-08-12 Thread jake 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 54914bf742fb9f293fd4e21e297878eee2754adc
Parents: 7ce2242 25c335f
Author: Jake Luciani j...@apache.org
Authored: Tue Aug 12 10:27:49 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Tue Aug 12 10:27:49 2014 -0400

--

--

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

2014-08-12 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 56adc4429f081a5e81988b54dc8fe4c4c420d1c4
Parents: f774b2a 3060ccc
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Aug 12 18:20:53 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Aug 12 18:20:53 2014 +0200

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


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

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

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

2014-08-12 Thread tylerhobbs 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: d2bed56b080fb4359734400092b966187f4a27b6
Parents: 2dfa90e d9b463e
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Aug 12 15:19:36 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Aug 12 15:19:36 2014 -0500

--
 CHANGES.txt|   1 +
 pylib/cqlshlib/test/test_cqlsh_output.py   | 110 ++--
 pylib/cqlshlib/test/test_keyspace_init.cql |  28 ++
 3 files changed, 33 insertions(+), 106 deletions(-)
--


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

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

2014-08-11 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: c7e191ba128841b3e67a168e0d0fb97ca2eed2dd
Parents: d2b24de 50ee3a7
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Aug 11 17:33:47 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Aug 11 17:33:47 2014 +0300

--

--

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

2014-08-11 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk

Conflicts:
test/system/test_thrift_server.py


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

Branch: refs/heads/trunk
Commit: cb8ce83257c0f90e7b338bf16064142d571f0132
Parents: 755d345 334969f
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Aug 12 00:18:54 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Aug 12 00:18:54 2014 +0300

--
 test/system/__init__.py   |  184 ---
 test/system/test_thrift_server.py | 2113 
 2 files changed, 2297 deletions(-)
--

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

2014-08-07 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 46193d7548aefb2f7c7b33597b282c0361e204fc
Parents: 17055bf ddda541
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Aug 7 16:22:52 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Aug 7 16:22:52 2014 +0200

--
 CHANGES.txt |   1 +
 .../apache/cassandra/tools/SSTableExport.java   | 132 ++-
 2 files changed, 74 insertions(+), 59 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/46193d75/src/java/org/apache/cassandra/tools/SSTableExport.java
--

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

2014-08-05 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: cc3bd8bc98b9ee42976fbd3cc9e8fba5aacc8417
Parents: 2809b06 e6602f7
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Aug 5 10:22:32 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Aug 5 10:22:32 2014 +0200

--
 CHANGES.txt  | 1 +
 build.xml| 2 +-
 .../org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java| 8 
 3 files changed, 6 insertions(+), 5 deletions(-)
--


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

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

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

2014-08-04 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 22cb054381db12bb5e2f73a7285c40c3c571e472
Parents: 656d93e 077d3ce
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Aug 4 21:24:09 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Aug 4 21:24:09 2014 +0300

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


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

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

2014-08-02 Thread dbrosius 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: d6f3cdf6ff38fcd301098a91d32bb2b4b47d2df0
Parents: be6cf8a 8d06dd1
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sun Aug 3 00:45:48 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sun Aug 3 00:45:48 2014 -0400

--
 build.xml  |  2 +-
 debian/changelog   |  6 ++
 .../apache/cassandra/thrift/CassandraServer.java   |  7 ++-
 .../cassandra/cql3/StaticColumnsQueryTest.java | 17 +
 4 files changed, 26 insertions(+), 6 deletions(-)
--


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

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

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

2014-08-01 Thread jake 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 87321cd6d0b07c376899854d1bfc6355220ae1cf
Parents: e3fa11b 5f0413b
Author: Jake Luciani j...@apache.org
Authored: Fri Aug 1 11:17:41 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Fri Aug 1 11:17:41 2014 -0400

--
 CHANGES.txt |  1 +
 .../cassandra/config/DatabaseDescriptor.java|  5 +++
 .../apache/cassandra/db/ColumnFamilyStore.java  | 23 +++---
 test/conf/cassandra.yaml|  1 +
 .../org/apache/cassandra/db/CommitLogTest.java  | 32 
 5 files changed, 44 insertions(+), 18 deletions(-)
--


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

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/87321cd6/test/unit/org/apache/cassandra/db/CommitLogTest.java
--
diff --cc test/unit/org/apache/cassandra/db/CommitLogTest.java
index f8cb8c8,a58549a..a919c85
--- a/test/unit/org/apache/cassandra/db/CommitLogTest.java
+++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java
@@@ -35,15 -35,14 +36,17 @@@ import org.apache.cassandra.SchemaLoade
  import org.apache.cassandra.Util;
  import org.apache.cassandra.config.Config;
  import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.config.KSMetaData;
  import org.apache.cassandra.db.commitlog.CommitLog;
  import org.apache.cassandra.db.commitlog.CommitLogDescriptor;
+ import org.apache.cassandra.db.commitlog.ReplayPosition;
  import org.apache.cassandra.db.commitlog.CommitLogSegment;
  import org.apache.cassandra.db.composites.CellName;
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.locator.SimpleStrategy;
  import org.apache.cassandra.net.MessagingService;
  import org.apache.cassandra.service.StorageService;
+ import org.apache.cassandra.utils.FBUtilities;
  
  import static org.apache.cassandra.utils.ByteBufferUtil.bytes;

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

2014-07-31 Thread marcuse 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 90ade6b45921c1a102cf97fa3fea7fca8462a085
Parents: a88c7e1 63407db
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Jul 31 08:00:42 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Jul 31 08:00:42 2014 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/cache/AutoSavingCache.java | 23 
 2 files changed, 15 insertions(+), 9 deletions(-)
--


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

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

2014-07-31 Thread tylerhobbs 
Merge branch 'cassandra-2.1' into trunk

Conflicts:
test/unit/org/apache/cassandra/service/MoveTest.java


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

Branch: refs/heads/trunk
Commit: 9b571d30686f3223834734e167919b115fecda5d
Parents: cf46e44 93942ba
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Jul 31 15:43:23 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Jul 31 15:43:23 2014 -0500

--

--

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

2014-07-30 Thread tylerhobbs 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: bdffd3c63d5be9c7a0f3712c98cb1c3810ddf893
Parents: 4626fc4 8d6b732
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Jul 30 16:00:43 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Jul 30 16:00:43 2014 -0500

--
 CHANGES.txt |  2 ++
 bin/cqlsh   | 19 ++---
 conf/cqlshrc.sample |  3 ++
 pylib/cqlshlib/tracing.py   | 29 ++--
 .../cassandra/net/OutboundTcpConnection.java|  2 +-
 .../apache/cassandra/tracing/TraceState.java| 22 +++
 .../org/apache/cassandra/tracing/Tracing.java   |  7 +++--
 7 files changed, 68 insertions(+), 16 deletions(-)
--


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

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

2014-07-29 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: b1c45b7f36da81a26965c6234b23d66acd923a74
Parents: 0fd1a0b db96239
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Jul 29 19:31:59 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Jul 29 19:31:59 2014 +0300

--

--

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

2014-07-24 Thread tylerhobbs 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 2f3f68366c3654d6eee83c4340a0590b438a29ce
Parents: 6d6ea5b ee18049
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Jul 24 17:44:01 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Jul 24 17:44:01 2014 -0500

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java | 4 
 2 files changed, 5 insertions(+)
--


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

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

2014-07-22 Thread tylerhobbs 
Merge branch 'cassandra-2.1' into trunk

Conflicts:
doc/cql/CQL.textile


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

Branch: refs/heads/trunk
Commit: dc84af47c34260f62e413c2334111fa91b746dec
Parents: 3a7242e e0b8887
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Jul 22 12:07:00 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Jul 22 12:07:00 2014 -0500

--

--

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

2014-07-17 Thread tylerhobbs 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: d0871336a6d4a546f1e55708f2908b600b48d975
Parents: 1a58ecc 3d0e54e
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Jul 17 15:00:35 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Jul 17 15:00:35 2014 -0500

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


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

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

2014-07-09 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 304ead14ed6822785ffd975722a626fea4a878f8
Parents: 23b0224 8984257
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Jul 9 18:23:26 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Jul 9 18:23:26 2014 +0200

--
 CHANGES.txt |   2 +
 .../cql3/statements/SelectStatement.java|  17 +-
 .../cassandra/cql3/StaticColumnsQueryTest.java  | 263 +++
 3 files changed, 277 insertions(+), 5 deletions(-)
--


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

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

2014-07-08 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk

Conflicts:
debian/changelog


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

Branch: refs/heads/trunk
Commit: 111f0c0f91e679145dd27b3123de78bac3e41156
Parents: d5265bb 04944f0
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Jul 8 20:21:26 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Jul 8 20:21:26 2014 +0300

--
 .rat-excludes   |  2 ++
 CHANGES.txt |  2 +-
 build.xml   |  2 +-
 debian/changelog| 12 
 .../apache/cassandra/db/BufferExpiringCell.java |  4 +--
 .../apache/cassandra/db/NativeExpiringCell.java |  4 +--
 .../AbstractSimplePerColumnSecondaryIndex.java  |  5 ++--
 .../db/index/SecondaryIndexManager.java | 31 ++--
 test/unit/org/apache/cassandra/db/CellTest.java | 21 +
 .../stress/generate/DistributionInverted.java   | 21 +
 .../cassandra/stress/generate/Partition.java| 21 +
 .../stress/generate/PartitionGenerator.java | 21 +
 .../stress/generate/RatioDistribution.java  | 21 +
 .../apache/cassandra/stress/generate/Row.java   | 21 +
 .../stress/generate/SeedGenerator.java  | 21 +
 .../stress/generate/SeedRandomGenerator.java| 21 +
 .../stress/generate/SeedSeriesGenerator.java| 21 +
 .../stress/generate/values/Generator.java   | 21 +
 .../stress/operations/FixedOpDistribution.java  | 21 +
 .../stress/operations/OpDistribution.java   | 21 +
 .../operations/OpDistributionFactory.java   | 21 +
 .../operations/SampledOpDistribution.java   | 21 +
 .../SampledOpDistributionFactory.java   | 21 +
 .../operations/userdefined/SchemaInsert.java| 21 +
 .../operations/userdefined/SchemaQuery.java | 21 +
 .../operations/userdefined/SchemaStatement.java | 21 +
 .../stress/settings/OptionAnyProbabilities.java | 21 +
 .../settings/OptionEnumProbabilities.java   | 21 +
 .../stress/settings/ValidationType.java | 21 +
 29 files changed, 480 insertions(+), 23 deletions(-)
--


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

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

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

2014-07-07 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: e28cc6354e3ac45edf4c6fafea4599720e2dab97
Parents: d13a996 59a8504
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Jul 7 18:06:31 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Jul 7 18:06:31 2014 +0200

--
 CHANGES.txt |   4 +-
 .../org/apache/cassandra/cql3/Constants.java|   8 +-
 .../org/apache/cassandra/cql3/UserTypes.java|  11 ++
 .../cassandra/cql3/VariableSpecifications.java  |   6 ++
 .../cql3/statements/SelectStatement.java|   1 +
 .../org/apache/cassandra/transport/Message.java |  51 +
 .../org/apache/cassandra/cql3/CQLTester.java|  82 --
 .../cassandra/cql3/ContainsRelationTest.java| 106 +++
 .../apache/cassandra/cql3/UserTypesTest.java|  33 ++
 9 files changed, 227 insertions(+), 75 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e28cc635/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java
--
diff --cc test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java
index 7b9ef91,0c6cfe1..508cc4a
--- a/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java
@@@ -1,12 -1,24 +1,7 @@@
 -/*
 - * Licensed to the Apache Software Foundation (ASF) under one
 - * or more contributor license agreements.  See the NOTICE file
 - * distributed with this work for additional information
 - * regarding copyright ownership.  The ASF licenses this file
 - * to you under the Apache License, Version 2.0 (the
 - * License); you may not use this file except in compliance
 - * with the License.  You may obtain a copy of the License at
 - *
 - * http://www.apache.org/licenses/LICENSE-2.0
 - *
 - * Unless required by applicable law or agreed to in writing, software
 - * distributed under the License is distributed on an AS IS BASIS,
 - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 - * See the License for the specific language governing permissions and
 - * limitations under the License.
 - */
  package org.apache.cassandra.cql3;
  
- import static com.google.common.collect.Lists.newArrayList;
- import static com.google.common.collect.Sets.newHashSet;
- 
  import org.junit.Test;
  
- import com.google.common.collect.ImmutableMap;
- 
  public class ContainsRelationTest extends CQLTester
  {
  @Test

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

2014-07-03 Thread marcuse 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 72c08f11a219151de1910b9d02a8b80c9e4d0f9e
Parents: c58b2b2 a0bfdeb
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Jul 3 14:29:59 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Jul 3 14:29:59 2014 +0200

--
 CHANGES.txt | 1 +
 NEWS.txt| 9 +
 .../org/apache/cassandra/config/DatabaseDescriptor.java | 5 +
 .../org/apache/cassandra/db/compaction/LeveledManifest.java | 5 -
 4 files changed, 19 insertions(+), 1 deletion(-)
--


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

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

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

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

2014-07-01 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 5b7798cd5e98450ed0baae6284cbf22e66f00fc6
Parents: 36640fc 2774758
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Jul 1 15:41:26 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Jul 1 15:41:26 2014 +0200

--
 build.xml | 45 -
 1 file changed, 40 insertions(+), 5 deletions(-)
--


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

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

2014-06-30 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: a586313ea1bdd5f2779727f09655456cda9c1ff0
Parents: 02f58ff d677e79
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Jun 30 16:48:07 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Jun 30 16:48:07 2014 +0200

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


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

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

2014-06-23 Thread benedict 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: cdf08084d46d4b9efb14a1e30bee6010caf16fea
Parents: 944c171 c33e77a
Author: Benedict Elliott Smith bened...@apache.org
Authored: Mon Jun 23 16:57:01 2014 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Mon Jun 23 16:57:01 2014 +0100

--
 bin/cqlsh | 4 
 1 file changed, 4 insertions(+)
--

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

2014-06-17 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 704469d95f3e2842eb174d887330eea682774e4e
Parents: 805a4ae 5e90091
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Jun 17 17:42:59 2014 -0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Jun 17 17:42:59 2014 -0700

--
 CHANGES.txt |  4 +-
 .../db/index/SecondaryIndexManager.java | 28 +-
 .../cassandra/db/ColumnFamilyStoreTest.java | 55 
 3 files changed, 85 insertions(+), 2 deletions(-)
--


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

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

2014-06-09 Thread dbrosius 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: a28f64f91238dc5cd1a7c71d8120aaa3fb2c9594
Parents: be94a90 b16c6b9
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Mon Jun 9 21:16:50 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Mon Jun 9 21:16:50 2014 -0400

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

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

2014-06-09 Thread dbrosius 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 2044424524a9cba47e58ba81feab6df5d17ac995
Parents: a28f64f deaf5ba
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Mon Jun 9 21:42:36 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Mon Jun 9 21:42:36 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/20444245/src/java/org/apache/cassandra/gms/Gossiper.java
--

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

2014-06-05 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 0d815af68fbbafca429b2f45e1d9bf1eb13b7024
Parents: c844081 029cd40
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Jun 6 01:01:49 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Jun 6 01:01:49 2014 +0300

--
 CHANGES.txt  |  1 +
 .../cassandra/db/HintedHandOffManager.java   | 19 +--
 2 files changed, 10 insertions(+), 10 deletions(-)
--


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

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

2014-06-05 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: c7ecd4a6c5bc76e92676c92a491f720680891168
Parents: 0d815af 54b2418
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Jun 6 01:12:02 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Jun 6 01:12:02 2014 +0300

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


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

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

2014-05-30 Thread jasobrown 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: d4f63aa578eec0412b7392cba208a0df5e62aa2d
Parents: 825b23b a30dfbd
Author: Jason Brown jasobr...@apple.com
Authored: Fri May 30 05:52:57 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Fri May 30 05:52:57 2014 -0700

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


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

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

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

2014-05-30 Thread aleksey 
Merge branch 'cassandra-2.1' 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/62e83d85
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62e83d85
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62e83d85

Branch: refs/heads/trunk
Commit: 62e83d85dfcf0716db775183ec132fcc57a5ee40
Parents: e91bf8f 9141f7b
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri May 30 21:28:30 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri May 30 21:28:30 2014 +0300

--
 CHANGES.txt   | 6 ++
 src/java/org/apache/cassandra/auth/Auth.java  | 2 +-
 src/java/org/apache/cassandra/auth/CassandraAuthorizer.java   | 2 +-
 src/java/org/apache/cassandra/auth/PasswordAuthenticator.java | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/62e83d85/CHANGES.txt
--
diff --cc CHANGES.txt
index f0aca21,5293580..178c0ea
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,8 +1,18 @@@
 +3.0
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Make incremental repair default (CASSANDRA-7250)
 +
++
+ 2.1.0
+ Merged from 1.2:
+ * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
+ 
+ 
  2.1.0-rc1
   * Revert flush directory (CASSANDRA-6357)
   * More efficient executor service for fast operations (CASSANDRA-4718)

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

2014-05-29 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: af593090b9695eb1c1f5c8ab337b48c85ae548ca
Parents: 56c2f0a ef41567
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu May 29 12:54:48 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu May 29 12:54:48 2014 +0200

--
 CHANGES.txt  | 1 +
 .../org/apache/cassandra/cql3/statements/SelectStatement.java| 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


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

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

2014-05-29 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: e28618fe89148757c6d7f129fe14fe1e9d58fb47
Parents: cfc3751 a0ef84f
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu May 29 19:08:05 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu May 29 19:08:05 2014 +0300

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


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

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

2014-05-22 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 5f643ffcc3ebdb9ba4295bb09098790914df7b9b
Parents: d4bf6d3 1147ee3
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu May 22 14:46:33 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu May 22 14:46:33 2014 +0200

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/cql3/CQLStatement.java |   2 +-
 .../org/apache/cassandra/cql3/QueryOptions.java |   5 +
 .../apache/cassandra/cql3/QueryProcessor.java   | 103 +++-
 .../apache/cassandra/cql3/UntypedResultSet.java |  58 -
 .../statements/AuthenticationStatement.java |   2 +-
 .../cql3/statements/AuthorizationStatement.java |   2 +-
 .../cql3/statements/BatchStatement.java |   4 +-
 .../cql3/statements/ModificationStatement.java  |   4 +-
 .../statements/SchemaAlteringStatement.java |   2 +-
 .../cql3/statements/SelectStatement.java|  48 ++--
 .../cql3/statements/TruncateStatement.java  |   2 +-
 .../cassandra/cql3/statements/UseStatement.java |   2 +-
 .../apache/cassandra/db/BatchlogManager.java|  27 +-
 .../org/apache/cassandra/db/SystemKeyspace.java | 245 ---
 .../ScheduledRangeTransferExecutorService.java  |   8 +-
 .../cassandra/service/StorageService.java   |  43 ++--
 .../cassandra/db/BatchlogManagerTest.java   |   8 +-
 .../apache/cassandra/db/HintedHandOffTest.java  |   6 +-
 .../unit/org/apache/cassandra/db/ScrubTest.java |  10 +-
 .../db/compaction/CompactionsPurgeTest.java |  20 +-
 .../io/sstable/CQLSSTableWriterTest.java|   2 +-
 .../service/LeaveAndBootstrapTest.java  |   4 +-
 .../cassandra/service/QueryPagerTest.java   |   4 +-
 .../apache/cassandra/triggers/TriggersTest.java |   4 +-
 25 files changed, 368 insertions(+), 248 deletions(-)
--


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

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f643ffc/test/unit/org/apache/cassandra/db/ScrubTest.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f643ffc/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
--
diff --cc test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
index 5820312,912c7f1..80608f5
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
@@@ -36,10 -36,8 +36,10 @@@ import static org.junit.Assert.assertEq
  import static org.apache.cassandra.db.KeyspaceTest.assertColumns;
  import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertTrue;
 +import static org.junit.Assert.assertNotNull;
 +import static org.junit.Assert.assertNull;
  
- import static org.apache.cassandra.cql3.QueryProcessor.processInternal;
+ import static org.apache.cassandra.cql3.QueryProcessor.executeInternal;
  
  import static org.apache.cassandra.Util.cellname;
  import org.apache.cassandra.utils.ByteBufferUtil;

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

2014-05-22 Thread brandonwilliams 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 864865da90543488618eb106e2bec6346c3ec79c
Parents: 5f643ff 9bd3887
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu May 22 09:14:21 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu May 22 09:14:21 2014 -0500

--
 .../apache/cassandra/cql3/QueryProcessor.java   | 46 +---
 .../cassandra/io/sstable/SSTableWriter.java |  3 +-
 2 files changed, 33 insertions(+), 16 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/864865da/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
--

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

2014-05-21 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: a519c0a6d711e3f62526c653797f1aa67806252d
Parents: 68ea489 82be86a
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed May 21 11:42:51 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed May 21 11:42:51 2014 +0200

--
 CHANGES.txt |  1 +
 .../cql3/statements/SelectStatement.java| 20 +++-
 2 files changed, 20 insertions(+), 1 deletion(-)
--


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

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

2014-05-19 Thread dbrosius 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: d1f1b8e1aad26fa2ed135a6e2285342e847b0b35
Parents: c2cfefc c0e94ae
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Mon May 19 21:22:59 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Mon May 19 21:22:59 2014 -0400

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


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

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

2014-05-16 Thread dbrosius 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 67ed3375b26286a1c767644283374e784df4563f
Parents: e48a00b 773b95e
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Wed May 7 21:23:38 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Wed May 7 21:23:38 2014 -0400

--
 CHANGES.txt| 3 ++-
 .../cassandra/service/PendingRangeCalculatorService.java   | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/67ed3375/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java
--

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

2014-05-16 Thread jake 
Merge branch 'cassandra-2.1' 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/fe2d7dda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe2d7dda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe2d7dda

Branch: refs/heads/trunk
Commit: fe2d7ddafa29b100b54aefd730d2855f84cd174e
Parents: adea05f 0cb1db6
Author: Jake Luciani j...@apache.org
Authored: Wed May 7 15:22:00 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Wed May 7 15:22:00 2014 -0400

--
 CHANGES.txt |  1 +
 .../cql3/statements/ModificationStatement.java  |  3 ++
 .../apache/cassandra/net/MessagingService.java  |  6 +--
 .../net/OutboundTcpConnectionPool.java  | 41 +---
 4 files changed, 43 insertions(+), 8 deletions(-)
--


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

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

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

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

2014-05-15 Thread jasobrown 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: e48a00b6da33c84200d537613299116a6224766f
Parents: 9ffb195 d267cf8
Author: Jason Brown jasobr...@apple.com
Authored: Wed May 7 16:35:11 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Wed May 7 16:35:11 2014 -0700

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java   | 3 ++-
 .../org/apache/cassandra/utils/BackgroundActivityMonitor.java | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
--


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

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

2014-05-05 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: ddd2ff7d63c9a9977eb2dd25936cecbb2ecd1cfb
Parents: f3945bc 3aa41fb
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon May 5 09:28:12 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon May 5 09:28:12 2014 +0200

--
 CHANGES.txt |   2 +
 interface/cassandra.thrift  |   3 +-
 .../org/apache/cassandra/config/CFMetaData.java | 108 +--
 .../cassandra/config/ColumnDefinition.java  |  34 +++---
 .../org/apache/cassandra/db/SuperColumns.java   |   5 +-
 .../composites/CompoundDenseCellNameType.java   |   8 +-
 .../cassandra/thrift/CassandraServer.java   |  14 ++-
 .../cassandra/config/ColumnDefinitionTest.java  |   2 +-
 8 files changed, 92 insertions(+), 84 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddd2ff7d/CHANGES.txt
--
diff --cc CHANGES.txt
index bc6db0d,2f55eee..f587a55
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,7 +1,15 @@@
 +3.0
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 +
  2.1.0-rc1
   * Parallel streaming for sstableloader (CASSANDRA-3668)
+  * Fix bugs in supercolumns handling (CASSANDRA-7138)
+  * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
  Merged from 2.0:
   * Make batchlog replica selection rack-aware (CASSANDRA-6551)
   * Suggest CTRL-C or semicolon after three blank lines in cqlsh 
(CASSANDRA-7142)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddd2ff7d/interface/cassandra.thrift
--

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddd2ff7d/src/java/org/apache/cassandra/config/ColumnDefinition.java
--

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

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

2014-05-03 Thread dbrosius 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: e5f08867e905803b25a5f2f068656ae6c4d76340
Parents: 425d318 b2fad36
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sun May 4 00:21:13 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sun May 4 00:21:13 2014 -0400

--
 .../cassandra/locator/CloudstackSnitch.java | 78 +---
 1 file changed, 51 insertions(+), 27 deletions(-)
--

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

2014-05-01 Thread brandonwilliams 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 3f25375a3c6c4442114589357fa1f714015aa09e
Parents: 0ed57bf cc77ac8
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu May 1 18:56:33 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu May 1 18:56:33 2014 -0500

--

--

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

2014-04-30 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: d9f06a3be095a6576974533d921a14819e43a91e
Parents: c06ba25 2269adb
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Apr 30 11:36:04 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Apr 30 11:36:04 2014 +0200

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/CFMetaData.java | 45 +---
 .../cassandra/thrift/CassandraServer.java   |  3 +-
 .../unit/org/apache/cassandra/SchemaLoader.java | 16 ++-
 .../apache/cassandra/config/CFMetaDataTest.java |  5 ++-
 5 files changed, 60 insertions(+), 10 deletions(-)
--


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

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

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

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

2014-04-28 Thread dbrosius 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 00b6a037293bb930f43180fb9e4fc895d70923ed
Parents: 2e96779 7316bb3
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Mon Apr 28 20:00:51 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Mon Apr 28 20:00:51 2014 -0400

--
 CHANGES.txt| 2 +-
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00b6a037/src/java/org/apache/cassandra/gms/FailureDetector.java
--

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

2014-04-28 Thread vijay 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: b2ef56478d5be36d5e20932428698ed930b9b992
Parents: afe2e14 d402cf6
Author: Vijay vijay2...@gmail.com
Authored: Mon Apr 28 21:39:20 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Mon Apr 28 21:39:20 2014 -0700

--
 conf/logback.xml|  2 +-
 .../cassandra/service/StorageService.java   | 49 ++--
 .../cassandra/service/StorageServiceMBean.java  | 21 -
 .../org/apache/cassandra/tools/NodeProbe.java   | 17 +++
 .../org/apache/cassandra/tools/NodeTool.java| 32 -
 5 files changed, 114 insertions(+), 7 deletions(-)
--


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

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

2014-04-25 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 54760888c83e975caa3b833fd33c205896d8883a
Parents: f107558 4410edf
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Apr 25 12:29:36 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Apr 25 12:29:36 2014 +0200

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

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

2014-04-25 Thread brandonwilliams 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: c3be2fefd20838f9b0779835edfd3627296568ef
Parents: 343b3fd 3a0cd65
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Apr 25 16:57:52 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Apr 25 16:57:52 2014 -0500

--

--

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

2014-04-24 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: bd64313231a91f879697450998ca5cffa49bcc2f
Parents: 16bb16e f5fd02f
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Apr 25 03:43:29 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Apr 25 03:43:29 2014 +0300

--
 CHANGES.txt |  3 +-
 .../cassandra/cache/RefCountedMemory.java   |  7 ++-
 .../cassandra/cache/SerializingCache.java   | 53 +++-
 3 files changed, 48 insertions(+), 15 deletions(-)
--


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

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

2014-04-23 Thread marcuse 
Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/cql/AlterTableStatement.java
src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java


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

Branch: refs/heads/trunk
Commit: f22e775fbe1d2f08faa59045a2b3c66dd7209a23
Parents: 7e27b55 4e95953
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Apr 23 16:28:30 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Apr 23 16:28:30 2014 +0200

--
 CHANGES.txt |   1 +
 conf/cassandra.yaml |  15 +-
 .../apache/cassandra/cache/AutoSavingCache.java |   2 +-
 .../cassandra/cache/RefCountedMemory.java   |  15 +-
 .../org/apache/cassandra/config/CFMetaData.java |  78 +++--
 .../org/apache/cassandra/config/Config.java |   4 +-
 .../cassandra/config/DatabaseDescriptor.java|  15 +-
 .../cassandra/cql3/statements/CFPropDefs.java   |   7 +-
 .../apache/cassandra/db/ColumnFamilyStore.java  |  13 +-
 .../org/apache/cassandra/db/DataTracker.java|  15 +-
 .../org/apache/cassandra/db/Directories.java|   2 +-
 .../compaction/AbstractCompactionStrategy.java  |   2 +-
 .../db/compaction/AbstractCompactionTask.java   |   4 +-
 .../db/compaction/CompactionController.java |   2 +-
 .../db/compaction/CompactionManager.java|  91 +++--
 .../cassandra/db/compaction/CompactionTask.java | 143 +++-
 .../db/compaction/LeveledCompactionTask.java|   2 +-
 .../db/compaction/SSTableSplitter.java  |   7 +-
 .../cassandra/db/compaction/Scrubber.java   |  57 ++--
 .../SizeTieredCompactionStrategy.java   |   6 +-
 .../cassandra/db/compaction/Upgrader.java   |  43 +--
 .../io/compress/CompressedSequentialWriter.java |  26 +-
 .../io/compress/CompressionMetadata.java| 181 +-
 .../io/sstable/AbstractSSTableSimpleWriter.java |   2 +-
 .../apache/cassandra/io/sstable/Descriptor.java |  49 ++-
 .../cassandra/io/sstable/IndexSummary.java  |  16 +-
 .../io/sstable/IndexSummaryBuilder.java |  75 -
 .../apache/cassandra/io/sstable/SSTable.java|   2 -
 .../cassandra/io/sstable/SSTableLoader.java |   2 +-
 .../cassandra/io/sstable/SSTableReader.java | 119 +--
 .../cassandra/io/sstable/SSTableRewriter.java   | 330 +++
 .../cassandra/io/sstable/SSTableWriter.java | 117 ++-
 .../io/sstable/metadata/MetadataCollector.java  |  18 +-
 .../io/sstable/metadata/MetadataSerializer.java |   2 +-
 .../io/util/BufferedPoolingSegmentedFile.java   |   5 +
 .../io/util/BufferedSegmentedFile.java  |   5 +
 .../io/util/ChecksummedSequentialWriter.java|   6 +-
 .../io/util/CompressedPoolingSegmentedFile.java |  15 +-
 .../io/util/CompressedSegmentedFile.java|  24 +-
 .../org/apache/cassandra/io/util/FileUtils.java |   5 +
 .../org/apache/cassandra/io/util/Memory.java|  32 +-
 .../cassandra/io/util/MmappedSegmentedFile.java |  24 +-
 .../cassandra/io/util/PoolingSegmentedFile.java |   7 +-
 .../apache/cassandra/io/util/SegmentedFile.java |  14 +-
 .../cassandra/io/util/SequentialWriter.java |  52 +--
 .../cassandra/service/FileCacheService.java |  94 --
 .../cassandra/streaming/StreamLockfile.java |  13 +-
 .../cassandra/tools/StandaloneScrubber.java |  11 -
 .../cassandra/tools/StandaloneSplitter.java |   4 -
 .../cassandra/tools/StandaloneUpgrader.java |   3 -
 .../org/apache/cassandra/utils/CLibrary.java|  59 ++--
 .../cassandra/utils/obs/OffHeapBitSet.java  |   5 +-
 .../db/compaction/LongCompactionsTest.java  |   2 +-
 .../cassandra/db/ColumnFamilyStoreTest.java |  63 +++-
 .../apache/cassandra/db/DirectoriesTest.java|  23 +-
 .../org/apache/cassandra/db/KeyCacheTest.java   |  21 +-
 .../unit/org/apache/cassandra/db/ScrubTest.java |  23 +-
 .../CompressedRandomAccessReaderTest.java   |  19 +-
 .../cassandra/io/sstable/LegacySSTableTest.java |   2 +-
 .../cassandra/io/sstable/SSTableUtils.java  |   2 +-
 .../metadata/MetadataSerializerTest.java|   5 +-
 .../cassandra/io/util/DataOutputTest.java   |   2 +-
 .../compress/CompressedInputStreamTest.java |   2 +-
 63 files changed, 1332 insertions(+), 673 deletions(-)
--


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

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

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

2014-04-22 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk

Conflicts:

tools/stress/src/org/apache/cassandra/stress/operations/CqlIndexedRangeSlicer.java
tools/stress/src/org/apache/cassandra/stress/operations/CqlReader.java


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

Branch: refs/heads/trunk
Commit: 99fbafee3e571ed7e73de8ed3fb9d9c27bcdb754
Parents: 5bbc54f 2c7622a
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Apr 22 22:43:16 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Apr 22 22:43:16 2014 +0300

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

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

2014-04-21 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: e5ace5b423af591cd828923e1096772c59273e35
Parents: 894d6f6 cde7809
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Apr 21 09:47:29 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Apr 21 09:47:29 2014 +0200

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


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

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

2014-04-11 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 8c0aa99279418a2f2e22f6fb7da224e7db5d22a2
Parents: cbb3c8f 3f00662
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Apr 11 21:03:53 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Apr 11 21:03:53 2014 +0300

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/db/BatchlogManager.java | 2 +-
 src/java/org/apache/cassandra/service/StorageService.java | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)
--


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

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

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

2014-04-08 Thread jasobrown 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: bd961f3fa179f96bdef539587cc61ae66a54fea2
Parents: f1d5bf1 66b3b2b
Author: Jason Brown jasobr...@apple.com
Authored: Tue Apr 8 16:29:26 2014 -0700
Committer: Jason Brown jasobr...@apple.com
Committed: Tue Apr 8 16:29:26 2014 -0700

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/net/OutboundTcpConnection.java | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


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

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

2014-04-03 Thread brandonwilliams 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: f4e8fc3f637a0108f453f9a9144c10d05ad79030
Parents: ca75b97 6d901f9
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Apr 3 18:33:56 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Apr 3 18:33:56 2014 -0500

--

--

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

2014-04-02 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk

Conflicts:
src/java/org/apache/cassandra/cql/QueryProcessor.java


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

Branch: refs/heads/trunk
Commit: 04f74a915c41bb7b7263c0ec2304e2d0f7f105c0
Parents: 2eecd40 8afe109
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Apr 2 14:02:31 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Apr 2 14:02:31 2014 +0200

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/CFMetaData.java | 39 +---
 .../cassandra/config/ColumnDefinition.java  |  9 +++
 .../apache/cassandra/cql3/QueryProcessor.java   |  4 +-
 .../cassandra/thrift/ThriftValidation.java  |  5 +-
 .../apache/cassandra/tools/SSTableImport.java   |  2 +-
 .../unit/org/apache/cassandra/SchemaLoader.java |  7 ++-
 .../unit/org/apache/cassandra/db/ScrubTest.java | 65 
 .../cassandra/thrift/ThriftValidationTest.java  | 53 ++--
 .../cassandra/tools/SSTableExportTest.java  | 35 +++
 10 files changed, 187 insertions(+), 33 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/04f74a91/src/java/org/apache/cassandra/config/ColumnDefinition.java
--

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

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

2014-04-02 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 5b85be04cbf49e306cd43563ee85652484179812
Parents: 500503d f7e690d
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Apr 2 20:32:49 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Apr 2 20:32:49 2014 +0200

--
 CHANGES.txt |   1 +
 .../apache/cassandra/cql3/ColumnCondition.java  | 176 ++-
 .../cql3/statements/CQL3CasConditions.java  |  11 +-
 3 files changed, 104 insertions(+), 84 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b85be04/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
--

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

2014-03-31 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: a2a463a66878cd62ecd0ea096b07f806d99f7548
Parents: eeef406 b7ac8f9
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Mar 31 13:11:00 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Mar 31 13:11:00 2014 +0300

--
 NEWS.txt|  2 +-
 .../org/apache/cassandra/config/CFMetaData.java |  3 +-
 .../apache/cassandra/db/BatchlogManager.java| 48 --
 .../apache/cassandra/net/MessagingService.java  |  6 +--
 .../apache/cassandra/service/StorageProxy.java  | 51 
 .../cassandra/db/BatchlogManagerTest.java   |  7 ++-
 6 files changed, 62 insertions(+), 55 deletions(-)
--


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

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

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

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

2014-03-25 Thread xedin 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: f31f68957211793f8f29334a577b1f8288e1c830
Parents: a562394 3bb87d1
Author: Pavel Yaskevich xe...@apache.org
Authored: Tue Mar 25 14:45:28 2014 -0700
Committer: Pavel Yaskevich xe...@apache.org
Committed: Tue Mar 25 14:45:28 2014 -0700

--
 CHANGES.txt |   1 +
 conf/cassandra.yaml |   6 +
 .../org/apache/cassandra/config/Config.java |  13 +-
 .../cassandra/config/DatabaseDescriptor.java|  68 --
 .../apache/cassandra/cql3/ColumnCondition.java  |   1 -
 .../cassandra/db/ArrayBackedSortedColumns.java  |  34 ++-
 .../cassandra/db/CollationController.java   |  46 +++-
 .../apache/cassandra/db/ColumnFamilyStore.java  |  87 +--
 .../cassandra/db/ColumnFamilyStoreMBean.java|   2 +-
 src/java/org/apache/cassandra/db/Memtable.java  |  72 +++---
 .../apache/cassandra/db/RowIteratorFactory.java |  10 +-
 .../db/commitlog/CommitLogSegment.java  |   3 +-
 .../db/composites/BoundedComposite.java |   2 +-
 .../cassandra/db/composites/Composite.java  |   2 +-
 .../cassandra/db/composites/Composites.java |   2 +-
 .../db/composites/CompoundComposite.java|   2 +-
 .../db/composites/CompoundSparseCellName.java   |   2 +-
 .../composites/CompoundSparseCellNameType.java  |   2 +-
 .../db/composites/SimpleComposite.java  |   2 +-
 .../db/composites/SimpleSparseCellName.java |   2 +-
 .../SimpleSparseInternedCellName.java   |   2 +-
 .../apache/cassandra/db/filter/ColumnSlice.java |   2 +-
 .../apache/cassandra/db/filter/QueryFilter.java |  31 ++-
 .../AbstractSimplePerColumnSecondaryIndex.java  |  21 +-
 .../cassandra/db/index/SecondaryIndex.java  |  23 +-
 .../db/index/composites/CompositesIndex.java|  18 +-
 .../db/index/composites/CompositesSearcher.java |  37 ++-
 .../cassandra/db/index/keys/KeysSearcher.java   |  18 +-
 .../cassandra/io/sstable/SSTableWriter.java |  10 +
 .../org/apache/cassandra/io/util/FileUtils.java |  51 ++--
 .../cassandra/metrics/ColumnFamilyMetrics.java  |  33 ++-
 .../apache/cassandra/utils/ByteBufferUtil.java  |   2 +-
 .../utils/memory/AbstractAllocator.java |  23 +-
 .../utils/memory/ContextAllocator.java  |  20 +-
 .../apache/cassandra/utils/memory/HeapPool.java |  38 ++-
 .../utils/memory/HeapPoolAllocator.java |  47 
 .../utils/memory/HeapSlabAllocator.java | 204 
 .../cassandra/utils/memory/HeapSlabPool.java|  34 ---
 .../org/apache/cassandra/utils/memory/Pool.java | 232 +++
 .../cassandra/utils/memory/PoolAllocator.java   | 223 +++---
 .../utils/memory/PoolCleanerThread.java |   4 +-
 .../cassandra/utils/memory/SlabAllocator.java   | 223 ++
 .../apache/cassandra/utils/memory/SlabPool.java |  41 
 test/conf/cassandra.yaml|   1 +
 .../cassandra/db/CollationControllerTest.java   |  13 +-
 .../apache/cassandra/db/RangeTombstoneTest.java |  32 ++-
 .../db/SecondaryIndexCellSizeTest.java  |  13 +-
 .../db/context/CounterContextTest.java  |  25 +-
 .../db/index/PerRowSecondaryIndexTest.java  |  14 +-
 49 files changed, 1047 insertions(+), 747 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f31f6895/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
--
diff --cc test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
index d8d3b60,e9fc746..21fd590
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
@@@ -42,13 -51,13 +51,14 @@@ import org.apache.cassandra.db.marshal.
  import org.apache.cassandra.exceptions.ConfigurationException;
  import org.apache.cassandra.io.sstable.SSTableReader;
  import org.apache.cassandra.utils.ByteBufferUtil;
+ import org.apache.cassandra.utils.concurrent.OpOrder;
+ import org.apache.cassandra.utils.memory.PoolAllocator;
  
+ import static org.apache.cassandra.Util.dk;
  import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertFalse;
  import static

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

2014-03-20 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 3d737ecbb37a0b25bb0b80dd87e07b00ca9345f2
Parents: 233cc8b 0bc0db0
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Mar 20 16:50:04 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Mar 20 16:50:04 2014 +0300

--
 .../cassandra/db/index/SecondaryIndexManager.java | 14 +-
 .../cassandra/db/marshal/CollectionTypeTest.java  |  1 -
 2 files changed, 9 insertions(+), 6 deletions(-)
--

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

2014-03-20 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 49642e7bf87dfaf82f351c16eca4d28a0e07f60d
Parents: 3d737ec 5f2e220
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Mar 20 18:25:45 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Mar 20 18:25:45 2014 +0100

--
 CHANGES.txt |   1 +
 lib/netty-3.6.6.Final.jar   | Bin 1206119 - 0 bytes
 lib/netty-all-4.0.17.Final.jar  | Bin 0 - 1613159 bytes
 .../org/apache/cassandra/cql3/QueryOptions.java |   6 +-
 .../org/apache/cassandra/cql3/ResultSet.java|  10 +-
 .../org/apache/cassandra/transport/CBCodec.java |   6 +-
 .../org/apache/cassandra/transport/CBUtil.java  |  75 +++--
 .../apache/cassandra/transport/Connection.java  |   5 +-
 .../apache/cassandra/transport/DataType.java|   6 +-
 .../org/apache/cassandra/transport/Event.java   |  20 ++--
 .../org/apache/cassandra/transport/Frame.java   | 104 ++-
 .../cassandra/transport/FrameCompressor.java|  10 +-
 .../org/apache/cassandra/transport/Message.java |  71 ++---
 .../apache/cassandra/transport/OptionCodec.java |  18 ++--
 .../transport/RequestThreadPoolExecutor.java| 101 +-
 .../org/apache/cassandra/transport/Server.java  |  90 
 .../cassandra/transport/ServerConnection.java   |   4 +-
 .../cassandra/transport/SimpleClient.java   |  93 -
 .../transport/messages/AuthChallenge.java   |   6 +-
 .../transport/messages/AuthResponse.java|   6 +-
 .../transport/messages/AuthSuccess.java |   6 +-
 .../transport/messages/AuthenticateMessage.java |   6 +-
 .../transport/messages/BatchMessage.java|   6 +-
 .../transport/messages/CredentialsMessage.java  |   6 +-
 .../transport/messages/ErrorMessage.java|   6 +-
 .../transport/messages/EventMessage.java|   6 +-
 .../transport/messages/ExecuteMessage.java  |   6 +-
 .../transport/messages/OptionsMessage.java  |   6 +-
 .../transport/messages/PrepareMessage.java  |   6 +-
 .../transport/messages/QueryMessage.java|   6 +-
 .../transport/messages/ReadyMessage.java|   6 +-
 .../transport/messages/RegisterMessage.java |   6 +-
 .../transport/messages/ResultMessage.java   |  26 ++---
 .../transport/messages/StartupMessage.java  |   6 +-
 .../transport/messages/SupportedMessage.java|   6 +-
 .../cassandra/stress/util/JavaDriverClient.java |   6 +-
 36 files changed, 374 insertions(+), 374 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/49642e7b/src/java/org/apache/cassandra/transport/messages/StartupMessage.java
--
diff --cc src/java/org/apache/cassandra/transport/messages/StartupMessage.java
index 5ae7a75,1a5071f..ac7a1f2
--- a/src/java/org/apache/cassandra/transport/messages/StartupMessage.java
+++ b/src/java/org/apache/cassandra/transport/messages/StartupMessage.java
@@@ -20,9 -20,11 +20,9 @@@ package org.apache.cassandra.transport.
  import java.util.HashMap;
  import java.util.Map;
  
- import org.jboss.netty.buffer.ChannelBuffer;
+ import io.netty.buffer.ByteBuf;
  
  import org.apache.cassandra.config.DatabaseDescriptor;
 -import org.apache.cassandra.exceptions.InvalidRequestException;
 -import org.apache.cassandra.service.ClientState;
  import org.apache.cassandra.service.QueryState;
  import org.apache.cassandra.transport.*;
  import org.apache.cassandra.utils.SemanticVersion;

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

2014-03-19 Thread tylerhobbs 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 00317fc8f33f146ece0b1bb4376e548e26c5df8e
Parents: 96b55ce 2a2141c
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Mar 19 11:43:36 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Mar 19 11:43:36 2014 -0500

--
 CHANGES.txt  |  4 +++-
 doc/cql3/CQL.textile | 19 +++
 2 files changed, 18 insertions(+), 5 deletions(-)
--


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

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

2014-03-14 Thread jbellis 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: fc770376b2df5cbc042a89a5269f7b7d89ee1aa6
Parents: 90783a1 fcd9a37
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Mar 14 14:27:33 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Mar 14 14:27:33 2014 -0500

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

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

2014-03-06 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: e30d6dca52cc33ab04f9296cb6961afdbf1e9c2b
Parents: 35e5721 a052a91
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Mar 6 10:28:48 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Mar 6 10:28:48 2014 +0100

--
 .../org/apache/cassandra/cql3/statements/CQL3CasConditions.java  | 3 ++-
 .../apache/cassandra/cql3/statements/ModificationStatement.java  | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)
--

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

2014-03-06 Thread tylerhobbs 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 9371892374ddb8cc1d495ec4d38554603ec78a3a
Parents: e30d6dc f67b7a4
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Mar 6 11:55:59 2014 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Mar 6 11:55:59 2014 -0600

--
 CHANGES.txt |   1 +
 build.xml   |   2 +-
 .../org/apache/cassandra/locator/Ec2Snitch.java |   2 +-
 .../locator/GossipingPropertyFileSnitch.java| 104 ---
 .../cassandra/locator/PropertyFileSnitch.java   |   2 +-
 .../cassandra/locator/SnitchProperties.java |  10 +-
 test/conf/cassandra-rackdc.properties.mod   |  17 +++
 .../GossipingPropertyFileSnitchTest.java|  59 +++
 .../YamlFileNetworkTopologySnitchTest.java  |   2 +-
 9 files changed, 176 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/93718923/CHANGES.txt
--
diff --cc CHANGES.txt
index 7cb3e97,af7f2fd..09ad14b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 +3.0
 + * Remove CQL2 (CASSANDRA-5918)
 + * add Thrift get_multi_slice call (CASSANDRA-6757)
 +
 +
  2.1.0-beta2
+  * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)
   * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
   * Fix ABTC NPE (CASSANDRA-6692)
   * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)

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

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

2014-03-03 Thread marcuse 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: db6b563f143dc5f2037244854527cafc8594e730
Parents: 2c8100a 56631e1
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Mar 3 15:04:17 2014 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Mar 3 15:04:17 2014 +0100

--

--

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

2014-02-28 Thread jbellis 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 3666e47a118f26e944fe51c89492b319f9a01b8d
Parents: 3c186be a6f5f36
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Feb 28 10:41:23 2014 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Feb 28 10:41:23 2014 -0600

--
 conf/cassandra.yaml  | 5 -
 src/java/org/apache/cassandra/config/Config.java | 2 --
 2 files changed, 7 deletions(-)
--

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

2014-02-26 Thread slebresne 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 8a64f0e03778c11d91a6affae558b194172f5b65
Parents: 1cb0dff dc38e4b
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Feb 26 14:49:01 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Feb 26 14:49:01 2014 +0100

--
 CHANGES.txt |   1 +
 .../apache/cassandra/db/AtomicBTreeColumns.java |  28 +++--
 .../cassandra/db/CollationController.java   |   6 +-
 .../org/apache/cassandra/db/DeletionInfo.java   |  15 ++-
 .../org/apache/cassandra/db/RangeTombstone.java |   5 +
 .../apache/cassandra/db/RangeTombstoneList.java |  65 ++--
 .../cassandra/db/filter/IDiskAtomFilter.java|   2 +
 .../cassandra/db/filter/NamesQueryFilter.java   |  30 ++
 .../apache/cassandra/db/filter/QueryFilter.java |   9 ++
 .../cassandra/db/filter/SliceQueryFilter.java   |  41 
 .../cassandra/db/RangeTombstoneListTest.java|  26 ++---
 .../apache/cassandra/db/RangeTombstoneTest.java | 102 +++
 .../cassandra/tools/SSTableImportTest.java  |   2 +-
 13 files changed, 294 insertions(+), 38 deletions(-)
--


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

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

2014-02-19 Thread aleksey 
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 22ab0264cc1a35fd8b20871c089f72f4453a758e
Parents: 420fd01 ce7bc6a
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Feb 19 22:27:42 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Feb 19 22:27:42 2014 +0300

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