Merge branch 'cassandra-2.1' into trunk
Conflicts:
build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea3ff25a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea3ff25a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea3ff25a
Branch: refs/heads/trunk
Commit: ea3ff25a0cc204b2c77b4c43da25011b8f62a845
Parents: a709821 407b5de
Author: T Jake Luciani <[email protected]>
Authored: Fri Feb 20 11:37:55 2015 -0500
Committer: T Jake Luciani <[email protected]>
Committed: Fri Feb 20 11:37:55 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 2 +-
tools/lib/cassandra-driver-core-2.0.9.2.jar | Bin 0 -> 1847276 bytes
3 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea3ff25a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 85ca87d,d9560fc..07f3448
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,65 -1,5 +1,66 @@@
+3.0
+ * Add role based access control (CASSANDRA-7653, 8650, 7216)
+ * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
+ * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
+ * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
+ * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
+ * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
+ * Support direct buffer decompression for reads (CASSANDRA-8464)
+ * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
+ * Group sstables for anticompaction correctly (CASSANDRA-8578)
+ * Add ReadFailureException to native protocol, respond
+ immediately when replicas encounter errors while handling
+ a read request (CASSANDRA-7886)
+ * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
+ * Allow mixing token and partition key restrictions (CASSANDRA-7016)
+ * Support index key/value entries on map collections (CASSANDRA-8473)
+ * Modernize schema tables (CASSANDRA-8261)
+ * Support for user-defined aggregation functions (CASSANDRA-8053)
+ * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
+ * Refactor SelectStatement, return IN results in natural order instead
+ of IN value list order and ignore duplicate values in partition key IN
restrictions (CASSANDRA-7981)
+ * Support UDTs, tuples, and collections in user-defined
+ functions (CASSANDRA-7563)
+ * Fix aggregate fn results on empty selection, result column name,
+ and cqlsh parsing (CASSANDRA-8229)
+ * 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 partition key column (CASSANDRA-7855)
+ * 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 user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781,
7929,
+ 7924, 7812, 8063, 7813, 7708)
+ * 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, 8208)
+ * Select optimal CRC32 implementation at runtime (CASSANDRA-8614)
+ * Evaluate MurmurHash of Token once per query (CASSANDRA-7096)
+
+
2.1.4
+ * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
* Fix CommitLog.forceRecycleAllSegments() memory access error
(CASSANDRA-8812)
* Improve assertions in Memory (CASSANDRA-8792)
* Fix SSTableRewriter cleanup (CASSANDRA-8802)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea3ff25a/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 0b9d1a2,e969085..416f0e0
--- a/build.xml
+++ b/build.xml
@@@ -376,14 -401,9 +376,14 @@@
<dependency groupId="io.netty" artifactId="netty-all"
version="4.0.23.Final" />
<dependency groupId="com.google.code.findbugs" artifactId="jsr305"
version="2.0.2" />
<dependency groupId="com.clearspring.analytics" artifactId="stream"
version="2.5.2" />
- <dependency groupId="com.datastax.cassandra"
artifactId="cassandra-driver-core" version="2.1.2" />
+ <dependency groupId="com.datastax.cassandra"
artifactId="cassandra-driver-core" version="2.0.9.2" />
+ <dependency groupId="org.javassist" artifactId="javassist"
version="3.18.2-GA" />
+ <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"
version="0.3.2" />
<dependency groupId="net.sf.supercsv" artifactId="super-csv"
version="2.1.0" />
<dependency groupId="net.ju-n.compile-command-annotations"
artifactId="compile-command-annotations" version="1.2.0" />
+ <dependency groupId="org.fusesource" artifactId="sigar"
version="1.6.4">
+ <exclusion groupId="log4j" artifactId="log4j"/>
+ </dependency>
</dependencyManagement>
<developer id="alakshman" name="Avinash Lakshman"/>
<developer id="aleksey" name="Aleksey Yeschenko"/>
