Merge branch 'b1.5' into b1.6

Conflicts: CHANGES.txt README.md
christobill · Jul 21, 2016 · afded21 · afded21
2 parents 107dedc + 50614ca
commit afded21
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -38,6 +38,9 @@
 
 ********************************************************************************
 
+1.5.1
+ * Includes all patches up to 1.4.4
+
 1.5.0
  * Fixed assembly build (SPARKC-311)
  * Upgrade Cassandra version to 3.0.2 by default and allow to specify arbitrary Cassandra version for
@@ -76,7 +79,7 @@
 ********************************************************************************
 
 1.4.4
- * Use executeAsync when joining with C* table (SPARKC-233)OA
+ * Use executeAsync when joining with C* table (SPARKC-233)
 
 1.4.3
  * Disable delayed retrying (SPARKC-360)