Skip to content

Commit

Permalink
Revert "Prepare release 1.4.0-RC1"
Browse files Browse the repository at this point in the history
This reverts commit 4a8a2db.
  • Loading branch information
pkolaczk committed Aug 7, 2015
1 parent 4a8a2db commit 455a64b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
7 changes: 1 addition & 6 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
1.4.0 RC1
* Fixed UDT column bug in SparkSQL (SPARKC-219)
* Includes all patches up to release 1.2.5 and 1.3.0
- Fixed connection caching, changed SSL EnabledAlgorithms to Set (SPARKC-227)

1.4.0 M2
* Includes some unreleased patches from 1.2.5
* Includes unreleased patches 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)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ This project has been published to the Maven Central Repository.
For SBT to download the connector binaries, sources and javadoc, put this in your project
SBT config:

libraryDependencies += "com.datastax.spark" %% "spark-cassandra-connector" % "1.4.0-RC1"
libraryDependencies += "com.datastax.spark" %% "spark-cassandra-connector" % "1.4.0-M2"

If you want to access the functionality of Connector from Java, you may want to add also a Java API module:

libraryDependencies += "com.datastax.spark" %% "spark-cassandra-connector-java" % "1.4.0-RC1"
libraryDependencies += "com.datastax.spark" %% "spark-cassandra-connector-java" % "1.4.0-M2"

## Building
See [Building And Artifacts](doc/12_building_and_artifacts.md)
Expand Down
2 changes: 1 addition & 1 deletion project/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ object Settings extends Build {

lazy val buildSettings = Seq(
organization := "com.datastax.spark",
version in ThisBuild := s"1.4.0-RC1$versionSuffix",
version in ThisBuild := s"1.4.0-M2$versionSuffix",
scalaVersion := Versions.scalaVersion,
crossScalaVersions := Versions.crossScala,
crossVersion := CrossVersion.binary,
Expand Down

0 comments on commit 455a64b

Please sign in to comment.