From ae62c947fc245295785324502bf6bc2c1c8477f9 Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Tue, 23 Jul 2013 15:44:09 +0200
Subject: [PATCH 1/2] Update versions for 1.2.7 release

---
 NEWS.txt         | 1 +
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/NEWS.txt b/NEWS.txt
index d4d127b9fd..9a7dd51c64 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -15,6 +15,7 @@ using the provided 'sstableupgrade' tool.
 
 1.2.7
 =====
+
 Upgrading
 ---------
     - If you have decommissioned a node in the past 72 hours, it is imperative
diff --git a/build.xml b/build.xml
index 8d54554ef9..523a225cd2 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="1.2.6"/>
+    <property name="base.version" value="1.2.7"/>
     <property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
     <property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
     <property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
diff --git a/debian/changelog b/debian/changelog
index 3be9ba0759..d0c70178d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.2.7) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Tue, 23 Jul 2013 15:42:51 +0200
+
 cassandra (1.2.6) unstable; urgency=low
 
   * New release

From 66bd60590a82d78790c279bf1d2130b82a7d6475 Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Tue, 23 Jul 2013 18:59:43 +0200
Subject: [PATCH 2/2] Document multiline comments

---
 doc/cql3/CQL.textile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index f7d2ddae8b..44c4dd26c5 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -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