Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54f728c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54f728c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54f728c7 Branch: refs/heads/trunk Commit: 54f728c771742fba66ff751f305a3cf1f5676c7d Parents: ea565aa 05f1209 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Jan 14 21:22:07 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Jan 14 21:22:07 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/thrift/ThriftConversion.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/54f728c7/src/java/org/apache/cassandra/thrift/ThriftConversion.java ----------------------------------------------------------------------
