cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject [2/2] git commit: merge from 1.1
Date Mon, 28 Jan 2013 18:48:29 GMT
Updated Branches:
  refs/heads/cassandra-1.2 7752f018b -> 4feb87d37


merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: 4feb87d37544b9fde722786555475f2f790059ca
Parents: 7752f01 73d828e
Author: Pavel Yaskevich <xedin@apache.org>
Authored: Mon Jan 28 10:45:47 2013 -0800
Committer: Pavel Yaskevich <xedin@apache.org>
Committed: Mon Jan 28 10:45:47 2013 -0800

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../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 ++-
 7 files changed, 52 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4feb87d3/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4feb87d3/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4feb87d3/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4feb87d3/src/java/org/apache/cassandra/thrift/TBinaryProtocol.java
----------------------------------------------------------------------


Mime
View raw message