mesosphere/marathon — pull request #379 by activars (2014-07-08 22:08:24+00:00)
Title: Fix bugs in startup script

Hi,

This PR provides a couple of fixes to the startup script.

Custom `zk` option specified in '$conf_dir' is not correctly handled. The default master and zookeeper configuration should only append to cmd when custom options are not given.

Thanks.