Updated Branches: refs/heads/cassandra-1.2.0 f8b939ab0 -> 8dd1d56b4 refs/heads/trunk 69accb311 -> 6a2c7c35e
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/6a2c7c35 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a2c7c35 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a2c7c35 Branch: refs/heads/trunk Commit: 6a2c7c35ef5ef522cdbd0d2a47756f94bd804ab5 Parents: 69accb3 0cc554e Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Nov 16 16:36:25 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Nov 16 16:36:25 2012 -0600 ---------------------------------------------------------------------- .../cli/transport/FramedTransportFactory.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
