Merge branch 'cassandra-1.2' into trunk

This commit is contained in:
Aleksey Yeschenko 2013-05-15 17:54:50 +03:00
commit c8df27b864
2 changed files with 2 additions and 2 deletions

2
debian/changelog vendored
View File

@ -2,7 +2,7 @@ cassandra (1.2.5) unstable; urgency=low
* New release
-- Sylvain Lebresne <slebresne@apache.org> Fri, 03 May 2013 17:52:01 +0200
-- Sylvain Lebresne <slebresne@apache.org> Wed, 15 May 2013 15:20:01 +0200
cassandra (1.2.4) unstable; urgency=low

View File

@ -1,6 +1,6 @@
<link rel="StyleSheet" href="CQL.css" type="text/css" media="screen">
h1. Cassandra Query Language (CQL) v3.0.2
h1. Cassandra Query Language (CQL) v3.0.3
<span id="tableOfContents">