Merge branch 'cassandra-2.1' into trunk
Conflicts:
NEWS.txt
src/java/org/apache/cassandra/transport/Server.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a848b08c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a848b08c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a848b08c
Branch: refs/heads/trunk
Commit: a848b08ceb4873cc773919a0065346bba5e9cafb
Parents: 816c905 dacddd2
Author: Jake Luciani <[email protected]>
Authored: Wed Oct 8 16:34:35 2014 -0400
Committer: Jake Luciani <[email protected]>
Committed: Wed Oct 8 16:34:35 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 9 +
build.xml | 4 +-
lib/licenses/netty-all-4.0.20.Final.txt | 202 -------------------
lib/licenses/netty-all-4.0.23.Final.txt | 202 +++++++++++++++++++
lib/netty-all-4.0.20.Final.jar | Bin 1721619 -> 0 bytes
lib/netty-all-4.0.23.Final.jar | Bin 0 -> 1779991 bytes
.../org/apache/cassandra/transport/Server.java | 22 +-
8 files changed, 234 insertions(+), 206 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a848b08c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9d522b7,159979f..79cc6f1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,5 +1,37 @@@
+3.0
+ * Support for scripting languages in user-defined functions (CASSANDRA-7526)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Improve query to read paxos table on propose (CASSANDRA-7929)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * Optimize java source-based UDF invocation (CASSANDRA-7924)
+ * 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)
+ * Support Java source code for user-defined functions (CASSANDRA-7562)
+ * Require arg types to disambiguate UDF drops (CASSANDRA-7812)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Verify that UDF class methods are static (CASSANDRA-7781)
+ * Support pure user-defined functions (CASSANDRA-7395, 7740)
+ * 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)
+
+
2.1.1
+ * Upgrade netty version and enable epoll event loop (CASSANDRA-7761)
* Don't duplicate sstables smaller than split size when using
the sstablesplitter tool (CASSANDRA-7616)
* Avoid re-parsing already prepared statements (CASSANDRA-7923)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a848b08c/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 74ebb41,74fe652..99144ca
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,27 -13,15 +13,36 @@@ restore snapshots created with the prev
'sstableloader' tool. You can upgrade the file format of your snapshots
using the provided 'sstableupgrade' tool.
+3.0
+===
+
+New features
+------------
+ - SSTable file name is changed. Now you don't have Keyspace/CF name
+ in file name. Also, secondary index has its own directory under parent's
+ directory.
+
+
+Upgrading
+---------
+ - cassandra-cli has been removed. Please use cqlsh instead.
+ - YamlFileNetworkTopologySnitch has been removed; switch to
+ GossipingPropertyFileSnitch instead.
+ - CQL2 has been removed entirely in this release (previously deprecated
+ in 2.0.0). Please switch to CQL3 if you haven't already done so.
+ - Very large batches will now be rejected (defaults to 50kb). This
+ can be customized by modifying batch_size_fail_threshold_in_kb.
+
+
+ 2.1.1
+ =====
+
+ New features
+ ------------
+ - Netty support for epoll on linux is now enabled. If for some
+ reason you want to disable it pass, the following system property
+ -Dcassandra.native.epoll.enabled=false
+
2.1
===
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a848b08c/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index e05b5c9,84b10ed..eaa1b60
--- a/build.xml
+++ b/build.xml
@@@ -366,9 -402,8 +366,9 @@@
<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.0.5" />
+ <dependency groupId="org.javassist" artifactId="javassist"
version="3.18.2-GA" />
<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="net.ju-n.compile-command-annotations"
artifactId="compile-command-annotations" version="1.2.0" />
</dependencyManagement>
<developer id="alakshman" name="Avinash Lakshman"/>
<developer id="aleksey" name="Aleksey Yeschenko"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a848b08c/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------
