cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Date Tue, 29 Jan 2013 18:10:09 GMT
Updated Branches:
  refs/heads/trunk c25a6a14c -> de0743fd0


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/de0743fd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de0743fd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de0743fd

Branch: refs/heads/trunk
Commit: de0743fd00e469ea42524f1a258a81eced51d0e4
Parents: c25a6a1 be36736
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Jan 29 19:09:52 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Jan 29 19:09:52 2013 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +
 .../statements/CreateColumnFamilyStatement.java    |   14 +++---
 .../cassandra/hadoop/ColumnFamilyOutputFormat.java |    4 +-
 .../cassandra/hadoop/ColumnFamilyRecordReader.java |    4 +-
 .../org/apache/cassandra/hadoop/ConfigHelper.java  |   34 ++++++++++++++-
 .../apache/cassandra/thrift/ITransportFactory.java |    3 +-
 .../apache/cassandra/thrift/TBinaryProtocol.java   |    8 +++
 .../cassandra/thrift/TFramedTransportFactory.java  |    7 ++-
 8 files changed, 61 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/de0743fd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5ae58fe,e1af9ee..7ab72d1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,7 +1,15 @@@
 +1.3
 + * make index_interval configurable per columnfamily (CASSANDRA-3961)
 + * add default_tim_to_live (CASSANDRA-3974)
 + * add memtable_flush_period_in_ms (CASSANDRA-4237)
 + * replace supercolumns internally by composites (CASSANDRA-3237, 5123)
 + * upgrade thrift to 0.9.0 (CASSANDRA-3719)
 +
  1.2.2
   * fix symlinks under data dir not working (CASSANDRA-5185)
+  * fix bug in compact storage metadata handling (CASSANDRA-5189)
  
 +
  1.2.1
   * stream undelivered hints on decommission (CASSANDRA-5128)
   * GossipingPropertyFileSnitch loads saved dc/rack info if needed (CASSANDRA-5133)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/de0743fd/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
----------------------------------------------------------------------


Mime
View raw message