cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [6/7] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Date Thu, 31 Jul 2014 17:39:33 GMT
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: adc138509e897da3c78a87213d678bf5f251e939
Parents: b888f80 0947fb8
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Thu Jul 31 12:39:13 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Thu Jul 31 12:39:13 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  2 +-
 .../apache/cassandra/db/RowCacheCQLTest.java    | 40 ++++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/adc13850/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4a49256,378e812..2501e51
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 +2.1.1
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 +Merged from 2.0:
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
 + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
 +
 +
  2.1.0-final
+  * Filter cached results correctly (CASSANDRA-7636)
   * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
   * Remove shuffle and taketoken (CASSANDRA-7601)
   * Clean up Windows batch scripts (CASSANDRA-7619)


Mime
View raw message