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/0eb048f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0eb048f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0eb048f2 Branch: refs/heads/trunk Commit: 0eb048f2358f37565703fb70152fc066aed8cc73 Parents: 90052d5 b973a33 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Jun 6 14:24:32 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Jun 6 14:24:32 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/hadoop/ConfigHelper.java | 10 +- .../apache/cassandra/thrift/ITransportFactory.java | 43 ++++++++- .../cassandra/thrift/TClientTransportFactory.java | 70 --------------- .../cassandra/thrift/TFramedTransportFactory.java | 11 +-- 4 files changed, 46 insertions(+), 88 deletions(-) ----------------------------------------------------------------------
