Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f92ae20a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f92ae20a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f92ae20a Branch: refs/heads/trunk Commit: f92ae20a84cc22d303234a9c8847ba1e8fa0b6d7 Parents: d1e41c0 319eeab Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Aug 7 11:57:22 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Aug 7 11:57:22 2014 -0500 ---------------------------------------------------------------------- .../cassandra/pig/CqlTableDataTypeTest.java | 39 ++----------- .../org/apache/cassandra/pig/CqlTableTest.java | 61 ++++++++------------ .../cassandra/pig/ThriftColumnFamilyTest.java | 14 ----- 3 files changed, 28 insertions(+), 86 deletions(-) ----------------------------------------------------------------------