Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e9f51d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e9f51d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e9f51d1 Branch: refs/heads/trunk Commit: 2e9f51d16d29782b55aa2b9a10b23849c01b9a61 Parents: c1dfc8f 6da1cbb Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Jun 6 17:01:02 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Jun 6 17:01:02 2013 -0500 ---------------------------------------------------------------------- .../cassandra/thrift/TFramedTransportFactory.java | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) ----------------------------------------------------------------------