Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/319eeabb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/319eeabb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/319eeabb Branch: refs/heads/cassandra-2.1 Commit: 319eeabb4c69dff22df9280a78e49e526a540d39 Parents: 0c2bbef 6fdcd3b Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Aug 7 11:56:57 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Aug 7 11:56:57 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/319eeabb/test/pig/org/apache/cassandra/pig/ThriftColumnFamilyTest.java ----------------------------------------------------------------------
