Merge branch 'cassandra-1.2' into trunk

2013-03-07 19:58:16 +03:00 · 2013-03-07 19:58:16 +03:00 · e5a04918b2
parent 5938070074 c3d75e4a79
commit e5a04918b2
2 changed files with 1 additions and 0 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -35,6 +35,7 @@
 Merged from 1.1:
 * nodetool: ability to repair specific range (CASSANDRA-5280)
 * Fix possible assertion triggered in SliceFromReadCommand (CASSANDRA-5284)
+ * cqlsh: Add inet type support on Windows (ipv4-only) (CASSANDRA-4801)


 1.2.2
--- a/lib/cql-internal-only-1.4.0.zip
+++ b/lib/cql-internal-only-1.4.0.zip