Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7e9cdff9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7e9cdff9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7e9cdff9 Branch: refs/heads/trunk Commit: 7e9cdff968a3b51400065d97728badf24a7e0c0d Parents: fbf075d 33c75e9 Author: Brandon Williams <[email protected]> Authored: Thu Feb 27 13:57:48 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Thu Feb 27 13:57:48 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/7e9cdff9/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e9cdff9/doc/cql3/CQL.textile ----------------------------------------------------------------------
