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/30f438ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30f438ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30f438ff Branch: refs/heads/trunk Commit: 30f438ff4da5143f53434d6a1d62e0628aa5fe89 Parents: 9c4824d 7e9cdff Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Feb 27 13:57:56 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Feb 27 13:57:56 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/cql3/CQL.textile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/30f438ff/CHANGES.txt ----------------------------------------------------------------------