Merge branch 'cassandra-3.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/600e1aa1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/600e1aa1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/600e1aa1 Branch: refs/heads/trunk Commit: 600e1aa1795bb9fecb71e05be42b22988026059f Parents: bf5dd03 d6e14b3 Author: Sam Tunnicliffe <[email protected]> Authored: Sat Sep 19 19:21:14 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Sat Sep 19 19:21:14 2015 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/thrift/ThriftConversion.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
