Skip to content

Commit

Permalink
Merge pull request #34 from dvonthenen/feature/ver010rc4
Browse files Browse the repository at this point in the history 
Bump version to 0.1.0-rc4
  • Loading branch information
David vonThenen authored Sep 28, 2016
2 parents 54fbbd3 + a302952 commit 1fb4c07
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ If [MesosDNS](https://github.com/mesosphere/mesos-dns) or another service discov
{
"id": "scaleio-scheduler",
"uris": [
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0-rc3/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0-rc3/scaleio-executor"
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0-rc4/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0-rc4/scaleio-executor"
],
"cmd": "chmod u+x scaleio-scheduler && ./scaleio-scheduler -loglevel=debug -rest.port=$PORT -uri=[IP ADDRESS FOR MESOS MASTER LEADER]: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] -executor.memory.non=256 -executor.cpu.non=0.5",
"mem": 32,
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.0-rc3
0.1.0-rc4
4 changes: 2 additions & 2 deletions demo/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ Utilize [scaleio.json](scaleio.json) to correctly match and/or update the intern
{
"id": "scaleio-scheduler",
"uris": [
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0-rc3/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0-rc3/scaleio-executor"
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0-rc4/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0-rc4/scaleio-executor"
],
"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 -executor.memory.non=256 -executor.cpu.non=0.5",
"mem": 32,
Expand Down
4 changes: 2 additions & 2 deletions demo/scaleio.json
View file
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.1.0-rc3/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0-rc3/scaleio-executor"
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0-rc4/scaleio-scheduler",
"https://github.com/codedellemc/scaleio-framework/releases/download/v0.1.0-rc4/scaleio-executor"
],
"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 -executor.memory.non=256 -executor.cpu.non=0.5",
"mem": 32,
Expand Down
22 changes: 11 additions & 11 deletions scaleio-scheduler/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const (
VersionInt = 1

//VersionStr in string form
VersionStr = "0.1.0-rc3"
VersionStr = "0.1.0-rc4"

//CPUPerMdmExecutor num of CPUs to MDM executor
CPUPerMdmExecutor = 1.5
Expand All @@ -37,16 +37,16 @@ const (

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

Expand Down

0 comments on commit 1fb4c07

Please sign in to comment.