cassandra-commits mailing list archives

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

Conflicts:
	lib/cassandra-driver-internal-only-2.1.2.post.zip


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

Branch: refs/heads/trunk
Commit: a10a2ba81585d6b6f056818a595654c80f06055c
Parents: 21bb6d2 d2583ce
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Thu Dec 18 12:38:47 2014 -0600
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Thu Dec 18 12:38:47 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |   3 +
 ...assandra-driver-internal-only-2.1.2.post.zip | Bin 132021 -> 0 bytes
 lib/cassandra-driver-internal-only-2.1.3.zip    | Bin 0 -> 132360 bytes
 lib/licenses/cassandra-driver-2.1.0b1.post.txt  | 177 -------------------
 lib/licenses/cassandra-driver-2.1.3.txt         | 177 +++++++++++++++++++
 5 files changed, 180 insertions(+), 177 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a10a2ba8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5007658,acf2fea..2848d53
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,7 +1,49 @@@
 +3.0
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * 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)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929,
 +   7924, 7812, 8063, 7813)
 + * 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)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 +
 +
  2.1.3
+  * (cqlsh) Fix compression options in DESCRIBE TABLE output when compression
+    is disabled (CASSANDRA-8288)
+  * (cqlsh) Fix DESCRIBE output after keyspaces are altered (CASSANDRA-7623)
   * Make sure we set lastCompactedKey correctly (CASSANDRA-8463)
   * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507)
   * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)


Mime
View raw message