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/bc94d385 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc94d385 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc94d385 Branch: refs/heads/trunk Commit: bc94d3859cc028650d75883c35d13d0a1ac4a1e0 Parents: e460e6c bef913a Author: Dave Brosius <[email protected]> Authored: Fri May 2 21:12:11 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Fri May 2 21:12:11 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/Term.java | 2 +- src/java/org/apache/cassandra/hadoop/cql3/CqlOutputFormat.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
