You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ee...@apache.org on 2012/01/18 17:55:27 UTC
[1/2] git commit: fix merge error;
recompile Cassandra.java with thrift 0.7.0
Updated Branches:
refs/heads/trunk 7c92fc52e -> bce44ff32
fix merge error; recompile Cassandra.java with thrift 0.7.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bce44ff3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bce44ff3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bce44ff3
Branch: refs/heads/trunk
Commit: bce44ff3297c36260a2adabea5f77c6b0b9dfe92
Parents: 7c92fc5
Author: Eric Evans <ee...@apache.org>
Authored: Wed Jan 18 10:54:33 2012 -0600
Committer: Eric Evans <ee...@apache.org>
Committed: Wed Jan 18 10:54:33 2012 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/thrift/Cassandra.java | 9036 ++++++++-------
1 files changed, 4558 insertions(+), 4478 deletions(-)
----------------------------------------------------------------------