Update CHANGES.txt

Conflicts: CHANGES.txt
datastax · Aug 7, 2015 · 3f8f2a6 · 3f8f2a6
1 parent 940d581
commit 3f8f2a6
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,9 +1,10 @@
 1.3.0
-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)
+ * 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)
+   - spark.cassandra.output.throughput_mb_per_sec can now be set to a decimal (SPARKC-226)
+   - Fixed Connection Caching, Changed SSL EnabledAlgorithms to Set (SPARKC-227)
 
 1.3.0 RC1
  * Fixed NoSuchElementException when using UDTs in SparkSQL (SPARKC-218)
@@ -46,10 +47,11 @@ Included from 1.2.5
 
 ********************************************************************************
 
-1.2.5
+1.2.5 (unreleased)
  * 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)
+ * Fixed Connection Caching, Changed SSL EnabledAlgorithms to Set (SPARKC-227)
 
 1.2.4
  * Cassandra native count is performed by `cassandraCount` method (SPARKC-215)