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/cb50f62b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb50f62b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb50f62b Branch: refs/heads/trunk Commit: cb50f62b03db5f76b6fe1366f96088eeccd2c6ff Parents: 6ac88ab 3b8482a Author: Dave Brosius <[email protected]> Authored: Sat May 17 12:49:21 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Sat May 17 12:49:21 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/QueryOptions.java | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb50f62b/CHANGES.txt ----------------------------------------------------------------------
