Merge branch 'cassandra-2.2' into trunk

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/525579d0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/525579d0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/525579d0

Branch: refs/heads/trunk
Commit: 525579d0dd53232c8c0462f80bae65235b2a97b0
Parents: f1d175f 94a68a1
Author: Sam Tunnicliffe <[email protected]>
Authored: Mon Jun 1 18:26:45 2015 +0100
Committer: Sam Tunnicliffe <[email protected]>
Committed: Mon Jun 1 18:26:45 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt          |   1 +
 doc/cql3/CQL.textile | 441 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 438 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/525579d0/CHANGES.txt
----------------------------------------------------------------------

Reply via email to