Repository: mesos Updated Branches: refs/heads/master 190d15886 -> 98557a7cf
Cleaned up TODO comments for ZK file:// URL support. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/98557a7c Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/98557a7c Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/98557a7c Branch: refs/heads/master Commit: 98557a7cfc58ab88827c0e81c639719b9761c67f Parents: 190d158 Author: Benjamin Mahler <[email protected]> Authored: Tue Jul 29 15:20:43 2014 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Tue Jul 29 15:20:43 2014 -0700 ---------------------------------------------------------------------- src/master/contender.cpp | 1 - src/master/detector.cpp | 1 - src/master/main.cpp | 1 - src/zookeeper/url.hpp | 1 + 4 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/98557a7c/src/master/contender.cpp ---------------------------------------------------------------------- diff --git a/src/master/contender.cpp b/src/master/contender.cpp index d6beb72..c1bf82b 100644 --- a/src/master/contender.cpp +++ b/src/master/contender.cpp @@ -76,7 +76,6 @@ Try<MasterContender*> MasterContender::create(const string& zk) if (zk == "") { return new StandaloneMasterContender(); } else if (strings::startsWith(zk, "zk://")) { - // TODO(kensipe): Add support for "--zk=file://". Try<zookeeper::URL> url = URL::parse(zk); if (url.isError()) { return Error(url.error()); http://git-wip-us.apache.org/repos/asf/mesos/blob/98557a7c/src/master/detector.cpp ---------------------------------------------------------------------- diff --git a/src/master/detector.cpp b/src/master/detector.cpp index 592741f..a34cc21 100644 --- a/src/master/detector.cpp +++ b/src/master/detector.cpp @@ -112,7 +112,6 @@ Try<MasterDetector*> MasterDetector::create(const string& master) if (master == "") { return new StandaloneMasterDetector(); } else if (master.find("zk://") == 0) { - // TODO(kensipe): Add support for "--zk=file://". Try<URL> url = URL::parse(master); if (url.isError()) { return Error(url.error()); http://git-wip-us.apache.org/repos/asf/mesos/blob/98557a7c/src/master/main.cpp ---------------------------------------------------------------------- diff --git a/src/master/main.cpp b/src/master/main.cpp index 8dac3ae..171b976 100644 --- a/src/master/main.cpp +++ b/src/master/main.cpp @@ -199,7 +199,6 @@ int main(int argc, char** argv) << " registry when using ZooKeeper"; } - // TODO(kensipe): Add support for "--zk=file://". string zk_; if (strings::startsWith(zk.get(), "file://")) { const string& path = zk.get().substr(7); http://git-wip-us.apache.org/repos/asf/mesos/blob/98557a7c/src/zookeeper/url.hpp ---------------------------------------------------------------------- diff --git a/src/zookeeper/url.hpp b/src/zookeeper/url.hpp index 11f2bdd..16e711c 100644 --- a/src/zookeeper/url.hpp +++ b/src/zookeeper/url.hpp @@ -48,6 +48,7 @@ namespace zookeeper { class URL { public: + // TODO(kensipe): Add support for "file://" based urls. static Try<URL> parse(const std::string& url); const Option<Authentication> authentication;
