cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 09 Oct 2014 16:10:37 GMT
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/7892b835
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7892b835
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7892b835

Branch: refs/heads/trunk
Commit: 7892b8355ca640055420e030b1c06e39b065452a
Parents: 50734f2 708adca
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Oct 9 11:10:29 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Oct 9 11:10:29 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 .../org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7892b835/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 16b450a,417e8c1..5ec542c
--- 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
+  * Allow concurrent use of CQLBulkOutputFormat (CASSANDRA-7776)
   * Shutdown JVM on OOM (CASSANDRA-7507)
   * Upgrade netty version and enable epoll event loop (CASSANDRA-7761)
   * Don't duplicate sstables smaller than split size when using


Mime
View raw message