natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-1.2' into trunk 

Conflicts:
	build.xml
	debian/changelog
This commit is contained in:
Sylvain Lebresne 2013-07-23 19:00:36 +02:00
parent db70bbe414 66bd60590a
commit 283b1a33b4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/cql3/CQL.textile
View File

@ -61,9 +61,13 @@ h3. Comments
A comment in CQL is a line beginning by either double dashes (@--@) or double slash (@//@).
Multi-line comments are also supported through enclosure withing @/*@ and @*/@ (but nesting is not supported).
bc(sample).
-- This is a comment
// This is a comment too
/* This is
a multiline comment */
h3(#statements). Statements