cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 21 Aug 2014 16:55:56 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/9a4f6bdf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a4f6bdf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a4f6bdf

Branch: refs/heads/trunk
Commit: 9a4f6bdf05e7bba565287671e8927756cd9458a9
Parents: f6ef8ef d586ea8
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Thu Aug 21 11:55:35 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Thu Aug 21 11:55:35 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                    |  1 +
 bin/cqlsh                      | 34 ++++++++++++++++++----------------
 pylib/cqlshlib/cql3handling.py | 13 +++++++++++--
 pylib/cqlshlib/pylexotron.py   |  4 +++-
 4 files changed, 33 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4f6bdf/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2466a01,11ec7ff..e0a414d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,5 +1,24 @@@
 +3.0
 + * 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
+  * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
   * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
   * Support list index operations with conditions (CASSANDRA-7499)
   * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4f6bdf/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------


Mime
View raw message