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/3608129a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3608129a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3608129a Branch: refs/heads/trunk Commit: 3608129a3d668fda1dc00ccf5bc14eaae1cfdaf6 Parents: b35486a 70fd478 Author: Tyler Hobbs <[email protected]> Authored: Wed Apr 30 16:06:48 2014 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Wed Apr 30 16:06:48 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
