cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 02 Oct 2014 18:05:59 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	build.xml
	src/java/org/apache/cassandra/cql/Cql.g
	test/unit/org/apache/cassandra/cql3/CqlParserTest.java


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

Branch: refs/heads/trunk
Commit: 9f4284aefbd642e10e387f71d221788d42da321b
Parents: a479fe0 2279d49
Author: Joshua McKenzie <josh.mckenzie@datastax.com>
Authored: Thu Oct 2 13:03:40 2014 -0500
Committer: Joshua McKenzie <josh.mckenzie@datastax.com>
Committed: Thu Oct 2 13:03:40 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                            | 1 +
 test/unit/org/apache/cassandra/cql3/CqlParserTest.java | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f4284ae/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1a3b285,ac83b12..c5c02ed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,5 +1,34 @@@
 +3.0
 + * 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
+  * Allow compilation in java 8 (CASSANDRA-7208)
   * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
   * Release references to overlapping sstables during compaction (CASSANDRA-7819)
   * Send notification when opening compaction results early (CASSANDRA-8034)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f4284ae/test/unit/org/apache/cassandra/cql3/CqlParserTest.java
----------------------------------------------------------------------


Mime
View raw message