Skip to content
This repository has been archived by the owner on Nov 20, 2019. It is now read-only.

Commit

Permalink
Merge pull request #342 from miguel0afd/before_1_1_0_RC1
Browse files Browse the repository at this point in the history
Some renaming before 1.1.0-rc1
  • Loading branch information
darroyo-stratio committed Jan 27, 2016
2 parents 3bde5fd + ea84513 commit c2322a3
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 7 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

Only listing significant user-visible, not internal code cleanups and minor bug fixes.

## 1.1.0 (January 2016)
* Flattener of subdocuments for relational interfaces
* Flattener of collections for relational interfaces
* Persistent views (not materialized)
* Improvements in the aliases resolution of Spark through the Crossdata Context
* Improvements in the stability of the Crossdata Servers
* Usage of environment variables to configure Crossdata

## 1.0.2 (January 2016)
* Downgrade postgres version to 9.2
* Permgem space increased
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>

<artifactId>crossdata-examples</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.0-RC1</version>
<packaging>jar</packaging>
<name>Examples</name>
<description>Examples using Crossdata with MongoDB and Cassandra</description>
Expand Down
3 changes: 2 additions & 1 deletion scripts/stratio-xd-init.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* limitations under the License.
*/
//Commmons
import org.apache.spark.sql.crossdata._
import org.apache.spark.sql.crossdata.XDContext
import org.apache.spark.{SparkContext, SparkConf}
import org.apache.spark.SPARK_VERSION
Expand All @@ -35,6 +36,6 @@ println("""Welcome to Stratio
_\ \/ _ \/ _ `/ __/ '_/
/___/ .__/\_,_/_/ /_/\_\ version %s
/_/
""".format("1.1.0", SPARK_VERSION))
""".format(CrossdataVersion, SPARK_VERSION))

val xdContext = new XDContext(sc)
6 changes: 3 additions & 3 deletions server/src/main/resources/server-reference.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ crossdata-server.akka.remote.netty.tcp.hostname = "127.0.0.1"
crossdata-server.akka.remote.netty.tcp.hostname = ${?crossdata_server_akka_remote_netty_tcp_hostname}
crossdata-server.akka.remote.netty.tcp.port = 13420
crossdata-server.akka.remote.netty.tcp.port = ${?crossdata_server_akka_remote_netty_tcp_port}
crossdata-server.akka.remote.netty.tcp.maximum-frame-size = 8MiB
crossdata-server.akka.remote.netty.tcp.maximum-frame-size = 16MiB
crossdata-server.akka.cluster.seed-nodes = ["akka.tcp://[email protected]:13420"]
crossdata-server.akka.cluster.server-nodes = ${?crossdata_server_akka_cluster_seed_nodes}
crossdata-server.config.cluster.name = "CrossdataServerCluster"
Expand All @@ -33,9 +33,9 @@ crossdata-server.config.akka.number.server-actor = 5
crossdata-server.config.spark.app.name = "CrossdataServer"
crossdata-server.config.spark.master = "local[4]"
crossdata-server.config.spark.master = ${?crossdata_server_config_spark_master}
crossdata-server.config.spark.driver.memory = 512M
crossdata-server.config.spark.driver.memory = 2048M
crossdata-server.config.spark.driver.memory = ${?crossdata_server_config_spark_driver_memory}
crossdata-server.config.spark.executor.memory = 512M
crossdata-server.config.spark.executor.memory = 2048M
crossdata-server_config_spark_executor_memory = ${?crossdata_server_config_spark_executor_memory}
crossdata-server.config.spark.cores.max = 4
crossdata-server.config.spark.cores.max = ${?crossdata_server_config_spark_cores_max}
Expand Down
4 changes: 2 additions & 2 deletions testsAT/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<properties>
<stratio-test-bdd.version>0.2.0-SNAPSHOT</stratio-test-bdd.version>
<crossdata.version>1.1.0-SNAPSHOT</crossdata.version>
<crossdata.version>1.1.0-RC1</crossdata.version>
<assertj-core.version>1.7.0</assertj-core.version>
</properties>
<groupId>com.stratio.crossdata</groupId>
<artifactId>tests</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.0-RC1</version>

<build>
<plugins>
Expand Down

0 comments on commit c2322a3

Please sign in to comment.