Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db829493 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db829493 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db829493 Branch: refs/heads/trunk Commit: db8294932d0dfaa3cc354794fee61c5531fbb101 Parents: ec308e6 31a9a2f Author: Jonathan Ellis <[email protected]> Authored: Thu Oct 3 09:31:16 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Oct 3 09:31:16 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 2 +- src/java/org/apache/cassandra/tools/BulkLoader.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/db829493/CHANGES.txt ----------------------------------------------------------------------
