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-1.2' into trunk
Date Tue, 12 Feb 2013 18:25:46 GMT
Updated Branches:
  refs/heads/cassandra-1.2 d0f7e9e14 -> aa7c7d9cd
  refs/heads/trunk f425c9251 -> 06d9bda83


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 06d9bda8322e4d4d267668f3bf8dded109e2b473
Parents: f425c92 aa7c7d9
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Feb 12 12:25:41 2013 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Feb 12 12:25:41 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/06d9bda8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a850c6b,0621c79..fe6d19e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -23,8 -15,8 +23,9 @@@
   * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
   * CQL3 refactor to allow conversion function (CASSANDRA-5226)
   * Fix drop of sstables in some circumstance (CASSANDRA-5232)
 + * Add support for LZ4 compression (CASSANDRA-5038)
   * Implement caching of authorization results (CASSANDRA-4295)
+  * Add support for LZ4 compression (CASSANDRA-5038)
  
  
  1.2.1


Mime
View raw message