Inherit mesos-slave attributes #154
Conversation
|
Why keep a png of Other than that i'm waiting for a review from @b0r6 and for the merge conflict to be resolved. ^_^ |
|
Someone was discussing that .svg is not rendered in GH Markdown. It supports raster image format only. |
|
I know about it not being rendered in GH markdown but does it need to be in this case? i imagine the docs folder will be used to generate a static site, probably using mkdocs like we do for Wakame-vdc and OpenVNet. |
|
Still waiting for a review from @b0r6 and either the removal of that png or an answer to my comment about the docs folder. :) |
|
+1 Though it contains the crash-recovery branch, right? Which hasn't been merged yet due to that missing test that I plan to write soon. |
|
Oh right... I actually hadn't realized that yet. 😮 Thanks. :) In that case we still need to get that tested first, indeed. |
# Conflicts: # cmd/openvdc-executor/main.go # cmd/openvdc-executor/sshd.go # hypervisor/lxc/lxc.go # hypervisor/types.go # model/model.pb.go
# Conflicts: # cmd/openvdc-executor/main.go # hypervisor/lxc/lxc.go # hypervisor/types.go # model/model.pb.go
# Conflicts: # ci/citest/acceptance-test/multibox/10.0.100.14-vdc-executor-lxc/guestroot/etc/mesos-slave/attributes # model/model.pb.go # registry/bindata_assetfs.go # scheduler/mesos.go
This reverts commit d7c74f4. logrus/syslog module blocks the build on non-Linux platforms.
# Conflicts: # cmd/openvdc-executor/main.go # model/model.pb.go
/etc/mesos-slave/attributesand/etc/openvdc/executor.tomlare having duplicate configuration items.This PR removes duplications from executor.toml and retrieve the attributes above from mesos-slave.