Skip to content

Commit

Permalink
Merge pull request #143 from dvonthenen/feature/release031
Browse files Browse the repository at this point in the history
Update version for 0.3.1 release
  • Loading branch information
David vonThenen committed Feb 28, 2017
2 parents cc54294 + 6660f23 commit 3fb79e9
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions .docs/user-guide/demo.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ but not always, the defaults are the correct values:
{
"id": "scaleio-scheduler",
"uris": [
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/scaleio-executor"
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/scaleio-executor"
],
"cmd": "chmod u+x scaleio-scheduler && ./scaleio-scheduler -loglevel=debug -rest.port=$PORT -uri=10.0.0.21:5050 -scaleio.clusterid=6f831c6866417634 -scaleio.password=F00barbaz -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",
"mem": 32,
Expand Down
8 changes: 4 additions & 4 deletions .docs/user-guide/experimental.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ and cURL the following JSON:
{
"id": "scaleio-scheduler",
"uris": [
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/scaleio-executor"
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/scaleio-executor"
],
"cmd": "chmod u+x scaleio-scheduler && ./scaleio-scheduler -loglevel=debug -experimental=true -rest.port=$PORT -uri=[IP ADDRESS FOR ANY MESOS MASTER]:5050",
"mem": 32,
Expand Down Expand Up @@ -96,8 +96,8 @@ following JSON:
{
"id": "scaleio-scheduler",
"uris": [
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/scaleio-executor"
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/scaleio-executor"
],
"cmd": "chmod u+x scaleio-scheduler && ./scaleio-scheduler -loglevel=debug -experimental=true -rest.port=$PORT -uri=[IP ADDRESS FOR ANY MESOS MASTER]:5050 -aws.accesskey=[ACCESS KEY] -aws.secretkey=[SECRET KEY]",
"mem": 32,
Expand Down
8 changes: 4 additions & 4 deletions .docs/user-guide/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ you need to replace with real values. Those placeholders are enclosed in bracket
{
"id": "scaleio-scheduler",
"uris": [
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/scaleio-executor"
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/scaleio-executor"
],
"cmd": "chmod u+x scaleio-scheduler && ./scaleio-scheduler -loglevel=debug -rest.port=$PORT -uri=[IP ADDRESS FOR ANY MESOS MASTER]:5050 -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]",
"mem": 32,
Expand Down Expand Up @@ -66,8 +66,8 @@ like before.
{
"id": "scaleio-scheduler",
"uris": [
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/scaleio-executor"
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/scaleio-executor"
],
"cmd": "chmod u+x scaleio-scheduler && ./scaleio-scheduler -loglevel=debug -rest.port=$PORT -uri=[IP ADDRESS FOR ANY MESOS MASTER]:5050 -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]",
"mem": 32,
Expand Down
4 changes: 2 additions & 2 deletions .docs/user-guide/scaleio.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"id": "scaleio-scheduler",
"uris": [
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/scaleio-executor"
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/scaleio-executor"
],
"cmd": "chmod u+x scaleio-scheduler && ./scaleio-scheduler -loglevel=debug -rest.port=$PORT -uri=10.0.0.21:5050 -scaleio.clusterid=6f831c6866417634 -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",
"mem": 32,
Expand Down
4 changes: 2 additions & 2 deletions .docs/user-guide/sioframework-latest.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"id": "scaleio-scheduler",
"uris": [
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/scaleio-executor"
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/scaleio-executor"
],
"cmd": "chmod u+x scaleio-scheduler && ./scaleio-scheduler -loglevel=debug -rest.port=$PORT -uri=[IP ADDRESS FOR MESOS MASTER]:5050 -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]",
"mem": 32,
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.0
0.3.1
22 changes: 11 additions & 11 deletions scaleio-scheduler/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const (
VersionInt = 1

//VersionStr in string form
VersionStr = "0.3.0"
VersionStr = "0.3.1"

//CPUPerMdmExecutor num of CPUs to MDM executor
CPUPerMdmExecutor = 1.5
Expand Down Expand Up @@ -42,16 +42,16 @@ const (

//consts internal
const (
debMdm = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/EMC-ScaleIO-mdm-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
debSds = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/EMC-ScaleIO-sds-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
debSdc = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/EMC-ScaleIO-sdc-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
debLia = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/EMC-ScaleIO-lia-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
debGw = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/emc-scaleio-gateway_2.0-10000.2072_amd64.deb"
rpmMdm = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/EMC-ScaleIO-mdm-2.0-10000.2072.el7.x86_64.rpm"
rpmSds = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/EMC-ScaleIO-sds-2.0-10000.2072.el7.x86_64.rpm"
rpmSdc = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/EMC-ScaleIO-sdc-2.0-10000.2072.el7.x86_64.rpm"
rpmLia = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/EMC-ScaleIO-lia-2.0-10000.2072.el7.x86_64.rpm"
rpmGw = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.0/EMC-ScaleIO-gateway-2.0-10000.2072.x86_64.rpm"
debMdm = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/EMC-ScaleIO-mdm-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
debSds = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/EMC-ScaleIO-sds-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
debSdc = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/EMC-ScaleIO-sdc-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
debLia = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/EMC-ScaleIO-lia-2.0-10000.2072.Ubuntu.14.04.x86_64.deb"
debGw = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/emc-scaleio-gateway_2.0-10000.2072_amd64.deb"
rpmMdm = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/EMC-ScaleIO-mdm-2.0-10000.2072.el7.x86_64.rpm"
rpmSds = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/EMC-ScaleIO-sds-2.0-10000.2072.el7.x86_64.rpm"
rpmSdc = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/EMC-ScaleIO-sdc-2.0-10000.2072.el7.x86_64.rpm"
rpmLia = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/EMC-ScaleIO-lia-2.0-10000.2072.el7.x86_64.rpm"
rpmGw = "https://github.com/codedellemc/scaleio-framework/releases/download/v0.3.1/EMC-ScaleIO-gateway-2.0-10000.2072.x86_64.rpm"
isoBin = "https://github.com/emccode/mesos-module-dvdi/releases/download/v0.4.6/libmesos_dvdi_isolator-1.0.1.so"
)

Expand Down

0 comments on commit 3fb79e9

Please sign in to comment.