Skip to content

Commit ad904c4

Browse files
author
David vonThenen
authored
Merge pull request #99 from dvonthenen/feature/release020rc1
Bump version for 0.2.0-rc1 release
2 parents 812fcdc + c86757b commit ad904c4

File tree

6 files changed

+29
-26
lines changed

6 files changed

+29
-26
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ If [MesosDNS](https://github.com/mesosphere/mesos-dns) or another service discov
3232
{
3333
"id": "scaleio-scheduler",
3434
"uris": [
35-
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/scaleio-scheduler",
36-
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/scaleio-executor"
35+
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/scaleio-scheduler",
36+
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/scaleio-executor"
3737
],
3838
"cmd": "chmod u+x scaleio-scheduler && ./scaleio-scheduler -loglevel=debug -rest.port=$PORT -uri=[IP ADDRESS FOR MESOS MASTER]:5050 -scaleio.clustername=[SCALEIO NAME] -scaleio.password=[SCALEIO GATEWAY PASSWORD] -scaleio.protectiondomain=[PROTECTION DOMAIN NAME] -scaleio.storagepool=[STORAGE POOL NAME] -scaleio.preconfig.primary=[MASTER MDM IP ADDRESS] -scaleio.preconfig.secondary=[SLAVE MDM IP ADDRESS] -scaleio.preconfig.tiebreaker=[TIEBREAKER MDM IP ADDRESS] -scaleio.preconfig.gateway=[GATEWAY IP ADDRESS]",
3939
"mem": 32,

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.0
1+
0.2.0-rc1

‎demo/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ Utilize [scaleio.json](scaleio.json) to correctly match and/or update the intern
8181
{
8282
"id": "scaleio-scheduler",
8383
"uris": [
84-
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/scaleio-scheduler",
85-
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/scaleio-executor"
84+
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/scaleio-scheduler",
85+
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/scaleio-executor"
8686
],
8787
"cmd": "chmod u+x scaleio-scheduler && ./scaleio-scheduler -loglevel=debug -rest.port=$PORT -uri=10.0.0.21:5050 -scaleio.clusterid=39f2e3fe27fbc1dc -scaleio.password=F00barbaz -scaleio.protectiondomain=default -scaleio.storagepool=default -scaleio.preconfig.primary=10.0.0.12 -scaleio.preconfig.secondary=10.0.0.11 -scaleio.preconfig.tiebreaker=10.0.0.13 -scaleio.preconfig.gateway=10.0.0.11",
8888
"mem": 32,

‎demo/scaleio.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"id": "scaleio-scheduler",
33
"uris": [
4-
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/scaleio-scheduler",
5-
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/scaleio-executor"
4+
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/scaleio-scheduler",
5+
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/scaleio-executor"
66
],
77
"cmd": "chmod u+x scaleio-scheduler && ./scaleio-scheduler -loglevel=debug -rest.port=$PORT -uri=10.0.0.21:5050 -scaleio.clusterid=39f2e3fe27fbc1dc -scaleio.password=F00barbaz -scaleio.protectiondomain=default -scaleio.storagepool=default -scaleio.preconfig.primary=10.0.0.12 -scaleio.preconfig.secondary=10.0.0.11 -scaleio.preconfig.tiebreaker=10.0.0.13 -scaleio.preconfig.gateway=10.0.0.11",
88
"mem": 32,

‎scaleio-scheduler/config/config.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const (
1313
VersionInt = 1
1414

1515
//VersionStr in string form
16-
VersionStr = "0.1.0"
16+
VersionStr = "0.2.0-rc1"
1717

1818
//CPUPerMdmExecutor num of CPUs to MDM executor
1919
CPUPerMdmExecutor = 1.5
@@ -39,16 +39,16 @@ const (
3939

4040
//consts internal
4141
const (
42-
debMdm = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/EMC-ScaleIO-mdm-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
43-
debSds = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/EMC-ScaleIO-sds-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
44-
debSdc = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/EMC-ScaleIO-sdc-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
45-
debLia = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/EMC-ScaleIO-lia-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
46-
debGw = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/emc-scaleio-gateway_2.0-10000.2072_amd64.deb"
47-
rpmMdm = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/EMC-ScaleIO-mdm-2.0-10000.2072.el7.x86_64.rpm"
48-
rpmSds = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/EMC-ScaleIO-sds-2.0-10000.2072.el7.x86_64.rpm"
49-
rpmSdc = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/EMC-ScaleIO-sdc-2.0-10000.2072.el7.x86_64.rpm"
50-
rpmLia = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/EMC-ScaleIO-lia-2.0-10000.2072.el7.x86_64.rpm"
51-
rpmGw = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0/EMC-ScaleIO-gateway-2.0-10000.2072.x86_64.rpm"
42+
debMdm = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/EMC-ScaleIO-mdm-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
43+
debSds = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/EMC-ScaleIO-sds-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
44+
debSdc = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/EMC-ScaleIO-sdc-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
45+
debLia = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/EMC-ScaleIO-lia-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
46+
debGw = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/emc-scaleio-gateway_2.0-10000.2072_amd64.deb"
47+
rpmMdm = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/EMC-ScaleIO-mdm-2.0-10000.2072.el7.x86_64.rpm"
48+
rpmSds = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/EMC-ScaleIO-sds-2.0-10000.2072.el7.x86_64.rpm"
49+
rpmSdc = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/EMC-ScaleIO-sdc-2.0-10000.2072.el7.x86_64.rpm"
50+
rpmLia = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/EMC-ScaleIO-lia-2.0-10000.2072.el7.x86_64.rpm"
51+
rpmGw = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.2.0-rc1/EMC-ScaleIO-gateway-2.0-10000.2072.x86_64.rpm"
5252
isoBin = "https://github.com/emccode/mesos-module-dvdi/releases/download/v0.4.6/libmesos_dvdi_isolator-1.0.1.so"
5353
)
5454

‎version.sh‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
#! /usr/bin/env bash
22
#echo "$#"
3+
#echo "$1"
4+
#echo "$2"
35
if [ "$#" -eq 0 ]; then
46
echo "version [old ver] [new ver]"
57
exit 1
68
fi
79

8-
#echo "$1"
9-
#echo "$2"
10-
1110
if [ "$#" -eq 1 ]; then
12-
grep -R --exclude-dir vendor --exclude-dir .git --exclude-dir mesos --exclude scaleio-executor --exclude scaleio-scheduler --exclude build.sh $1 ./
11+
tmp=`echo $1 | sed 's/\\./\\\\./g'`
12+
#echo $tmp
13+
grep -R --exclude-dir vendor --exclude-dir .git --exclude-dir mesos --exclude scaleio-executor --exclude scaleio-scheduler --exclude build.sh $tmp ./
1314
else
14-
find . -type f -name '*.json' -exec sed -i '' 's/'"$1"'/'"$2"'/g' {} +
15-
find . -type f -name '*.md' -exec sed -i '' 's/'"$1"'/'"$2"'/g' {} +
16-
find . -type f -name '*.go' -exec sed -i '' 's/'"$1"'/'"$2"'/g' {} +
17-
find . -type f -name 'VERSION' -exec sed -i '' 's/'"$1"'/'"$2"'/g' {} +
15+
tmp=`echo $1 | sed 's/\\./\\\\\\./g'`
16+
#echo $tmp
17+
find . -type f -name '*.json' -exec sed -i '' 's/'"$tmp"'/'"$2"'/g' {} +
18+
find . -type f -name '*.md' -exec sed -i '' 's/'"$tmp"'/'"$2"'/g' {} +
19+
find . -type f -name '*.go' -exec sed -i '' 's/'"$tmp"'/'"$2"'/g' {} +
20+
find . -type f -name 'VERSION' -exec sed -i '' 's/'"$tmp"'/'"$2"'/g' {} +
1821
fi

0 commit comments

Comments
 (0)