Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7ce3950a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ce3950a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ce3950a Branch: refs/heads/cassandra-2.1 Commit: 7ce3950a97a576b00c9936380cc3c5dc750ef4e7 Parents: 3050134 f122f99 Author: Jonathan Ellis <[email protected]> Authored: Fri Mar 14 15:28:10 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Mar 14 15:28:10 2014 -0500 ---------------------------------------------------------------------- test/pig/org/apache/cassandra/pig/CqlTableTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
