Merge branch 'b1.2' into b1.3

Conflicts: CHANGES.txt
datastax · Aug 6, 2015 · f1438b7 · f1438b7
2 parents 9f79487 + cf73e63
commit f1438b7
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,8 @@
- * (pulled) Changed default query timeout from 12 seconds to 2 minutes (SPARKC-220)
- * (pulled) Add a configurable delay between subsequent query retries (SPARKC-221)
- * Remove white spaces in c* connection host string (fix by Noorul Islam K M)
+Included from 1.2.5
+   * Changed default query timeout from 12 seconds to 2 minutes (SPARKC-220)
+   * Add a configurable delay between subsequent query retries (SPARKC-221)
+   * Remove white spaces in c* connection host string (fix by Noorul Islam K M)
+   * spark.cassandra.output.throughput_mb_per_sec can now be set to a decimal (SPARKC-226)
 
 1.3.0 RC1
  * Fixed NoSuchElementException when using UDTs in SparkSQL (SPARKC-218)
@@ -46,6 +48,7 @@
 1.2.5
  * Changed default query timeout from 12 seconds to 2 minutes (SPARKC-220)
  * Add a configurable delay between subsequent query retries (SPARKC-221)
+ * spark.cassandra.output.throughput_mb_per_sec can now be set to a decimal (SPARKC-226)
 
 1.2.4
  * Cassandra native count is performed by `cassandraCount` method (SPARKC-215)