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

Branch: refs/heads/trunk
Commit: e5d1528e54e122e9759d4b96e3d95db8a88a95de
Parents: 796ddbc f168fda
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Fri Sep 12 23:02:54 2014 -0700
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Fri Sep 12 23:03:25 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5d1528e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5c6bace,7030570..a05b91b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,3 +1,24 @@@
 +3.0
 + * 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)
 +
++
  2.1.1
   * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
   * (cqlsh) tab-completion for triggers (CASSANDRA-7824)

Reply via email to