Skip to content

Commit 7979fc3

Browse files
dszetodszeto
committed
Merge branch 'hotfix-0.6.1'
2 parents 80091bd + 8a0311a commit 7979fc3

File tree

39 files changed

+116
-116
lines changed

39 files changed

+116
-116
lines changed

‎bin/common.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# This script should be sourced with $BASE set to the base of the repository
44

5-
VERSION=0.6.0
5+
VERSION=0.6.1
66

77
# Play framework related
88
PLAY_OPTS=

‎commons/build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name := "PredictionIO Commons"
22

3-
version := "0.6.0"
3+
version := "0.6.1"
44

55
organization := "io.prediction"
66

‎dist/bin/backup‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ JARS="${JARS}:${PROG_HOME}/lib/minlog-1.2.jar"
145145
JARS="${JARS}:${PROG_HOME}/lib/mongo-java-driver-2.11.2.jar"
146146
JARS="${JARS}:${PROG_HOME}/lib/nscala-time_2.10-0.4.2.jar"
147147
JARS="${JARS}:${PROG_HOME}/lib/objenesis-1.2.jar"
148-
JARS="${JARS}:${PROG_HOME}/lib/predictionio-commons_2.10-0.6.0.jar"
149-
JARS="${JARS}:${PROG_HOME}/lib/predictionio-software-manager_2.10-0.6.0.jar"
148+
JARS="${JARS}:${PROG_HOME}/lib/predictionio-commons_2.10-0.6.1.jar"
149+
JARS="${JARS}:${PROG_HOME}/lib/predictionio-software-manager_2.10-0.6.1.jar"
150150
JARS="${JARS}:${PROG_HOME}/lib/reflectasm-1.07.jar"
151151
JARS="${JARS}:${PROG_HOME}/lib/scala-library-2.10.2.jar"
152152
JARS="${JARS}:${PROG_HOME}/lib/scopt_2.10-3.1.0.jar"

‎dist/bin/common.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# This script should be sourced with $BASE set to the base of the repository
44

5-
VERSION=0.6.0
5+
VERSION=0.6.1
66

77
# Play framework related
88
PLAY_OPTS=""

‎dist/bin/conncheck‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ JARS="${JARS}:${PROG_HOME}/lib/minlog-1.2.jar"
144144
JARS="${JARS}:${PROG_HOME}/lib/mongo-java-driver-2.11.2.jar"
145145
JARS="${JARS}:${PROG_HOME}/lib/nscala-time_2.10-0.4.2.jar"
146146
JARS="${JARS}:${PROG_HOME}/lib/objenesis-1.2.jar"
147-
JARS="${JARS}:${PROG_HOME}/lib/predictionio-commons_2.10-0.6.0.jar"
148-
JARS="${JARS}:${PROG_HOME}/lib/predictionio-connection-check-tool_2.10-0.6.0.jar"
147+
JARS="${JARS}:${PROG_HOME}/lib/predictionio-commons_2.10-0.6.1.jar"
148+
JARS="${JARS}:${PROG_HOME}/lib/predictionio-connection-check-tool_2.10-0.6.1.jar"
149149
JARS="${JARS}:${PROG_HOME}/lib/reflectasm-1.07.jar"
150150
JARS="${JARS}:${PROG_HOME}/lib/scala-library-2.10.2.jar"
151151
JARS="${JARS}:${PROG_HOME}/lib/slf4j-api-1.6.0.jar"

‎dist/bin/migration/appdata‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ JARS="${JARS}:${PROG_HOME}/../lib/minlog-1.2.jar"
144144
JARS="${JARS}:${PROG_HOME}/../lib/mongo-java-driver-2.11.2.jar"
145145
JARS="${JARS}:${PROG_HOME}/../lib/nscala-time_2.10-0.2.0.jar"
146146
JARS="${JARS}:${PROG_HOME}/../lib/objenesis-1.2.jar"
147-
JARS="${JARS}:${PROG_HOME}/../lib/predictionio-0.4-to-0.5-appdata-migration_2.10-0.6.0.jar"
148-
JARS="${JARS}:${PROG_HOME}/../lib/predictionio-commons_2.10-0.6.0.jar"
147+
JARS="${JARS}:${PROG_HOME}/../lib/predictionio-0.4-to-0.5-appdata-migration_2.10-0.6.1.jar"
148+
JARS="${JARS}:${PROG_HOME}/../lib/predictionio-commons_2.10-0.6.1.jar"
149149
JARS="${JARS}:${PROG_HOME}/../lib/reflectasm-1.07.jar"
150150
JARS="${JARS}:${PROG_HOME}/../lib/scala-library-2.10.2.jar"
151151
JARS="${JARS}:${PROG_HOME}/../lib/slf4j-api-1.6.0.jar"

‎dist/bin/restore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ JARS="${JARS}:${PROG_HOME}/lib/minlog-1.2.jar"
145145
JARS="${JARS}:${PROG_HOME}/lib/mongo-java-driver-2.11.2.jar"
146146
JARS="${JARS}:${PROG_HOME}/lib/nscala-time_2.10-0.4.2.jar"
147147
JARS="${JARS}:${PROG_HOME}/lib/objenesis-1.2.jar"
148-
JARS="${JARS}:${PROG_HOME}/lib/predictionio-commons_2.10-0.6.0.jar"
149-
JARS="${JARS}:${PROG_HOME}/lib/predictionio-software-manager_2.10-0.6.0.jar"
148+
JARS="${JARS}:${PROG_HOME}/lib/predictionio-commons_2.10-0.6.1.jar"
149+
JARS="${JARS}:${PROG_HOME}/lib/predictionio-software-manager_2.10-0.6.1.jar"
150150
JARS="${JARS}:${PROG_HOME}/lib/reflectasm-1.07.jar"
151151
JARS="${JARS}:${PROG_HOME}/lib/scala-library-2.10.2.jar"
152152
JARS="${JARS}:${PROG_HOME}/lib/scopt_2.10-3.1.0.jar"

‎dist/bin/settingsinit‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ JARS="${JARS}:${PROG_HOME}/lib/minlog-1.2.jar"
144144
JARS="${JARS}:${PROG_HOME}/lib/mongo-java-driver-2.11.2.jar"
145145
JARS="${JARS}:${PROG_HOME}/lib/nscala-time_2.10-0.4.2.jar"
146146
JARS="${JARS}:${PROG_HOME}/lib/objenesis-1.2.jar"
147-
JARS="${JARS}:${PROG_HOME}/lib/predictionio-commons_2.10-0.6.0.jar"
148-
JARS="${JARS}:${PROG_HOME}/lib/predictionio-settings-initialization_2.10-0.6.0.jar"
147+
JARS="${JARS}:${PROG_HOME}/lib/predictionio-commons_2.10-0.6.1.jar"
148+
JARS="${JARS}:${PROG_HOME}/lib/predictionio-settings-initialization_2.10-0.6.1.jar"
149149
JARS="${JARS}:${PROG_HOME}/lib/reflectasm-1.07.jar"
150150
JARS="${JARS}:${PROG_HOME}/lib/scala-library-2.10.2.jar"
151151
JARS="${JARS}:${PROG_HOME}/lib/slf4j-api-1.6.0.jar"

‎dist/bin/updatecheck‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ JARS="${JARS}:${PROG_HOME}/lib/minlog-1.2.jar"
145145
JARS="${JARS}:${PROG_HOME}/lib/mongo-java-driver-2.11.2.jar"
146146
JARS="${JARS}:${PROG_HOME}/lib/nscala-time_2.10-0.4.2.jar"
147147
JARS="${JARS}:${PROG_HOME}/lib/objenesis-1.2.jar"
148-
JARS="${JARS}:${PROG_HOME}/lib/predictionio-commons_2.10-0.6.0.jar"
149-
JARS="${JARS}:${PROG_HOME}/lib/predictionio-software-manager_2.10-0.6.0.jar"
148+
JARS="${JARS}:${PROG_HOME}/lib/predictionio-commons_2.10-0.6.1.jar"
149+
JARS="${JARS}:${PROG_HOME}/lib/predictionio-software-manager_2.10-0.6.1.jar"
150150
JARS="${JARS}:${PROG_HOME}/lib/reflectasm-1.07.jar"
151151
JARS="${JARS}:${PROG_HOME}/lib/scala-library-2.10.2.jar"
152152
JARS="${JARS}:${PROG_HOME}/lib/scopt_2.10-3.1.0.jar"

‎dist/bin/upgrade‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ JARS="${JARS}:${PROG_HOME}/lib/minlog-1.2.jar"
145145
JARS="${JARS}:${PROG_HOME}/lib/mongo-java-driver-2.11.2.jar"
146146
JARS="${JARS}:${PROG_HOME}/lib/nscala-time_2.10-0.4.2.jar"
147147
JARS="${JARS}:${PROG_HOME}/lib/objenesis-1.2.jar"
148-
JARS="${JARS}:${PROG_HOME}/lib/predictionio-commons_2.10-0.6.0.jar"
149-
JARS="${JARS}:${PROG_HOME}/lib/predictionio-software-manager_2.10-0.6.0.jar"
148+
JARS="${JARS}:${PROG_HOME}/lib/predictionio-commons_2.10-0.6.1.jar"
149+
JARS="${JARS}:${PROG_HOME}/lib/predictionio-software-manager_2.10-0.6.1.jar"
150150
JARS="${JARS}:${PROG_HOME}/lib/reflectasm-1.07.jar"
151151
JARS="${JARS}:${PROG_HOME}/lib/scala-library-2.10.2.jar"
152152
JARS="${JARS}:${PROG_HOME}/lib/scopt_2.10-3.1.0.jar"

0 commit comments

Comments
 (0)