Skip to content

Commit bd230bb

Browse files
author
Sivaram Mothiki
committed
Merge pull request #3857 from smothiki/marathon
feat(mesos-marathon): add marathon framework support for deis
2 parents ba24426 + e8abbe3 commit bd230bb

105 files changed

Lines changed: 8311 additions & 15 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ publisher/Godeps/
4444
publisher/image/bin/publisher
4545
router/Godeps/
4646
swarm/image/bin/
47+
mesos/**/bin/
48+
mesos/**/bindata/
49+
mesos/Dockerfile
50+
mesos/marathon-assembly.jar
4751

4852
# coverage reports
4953
.coverage

Godeps/Godeps.json

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/golang/glog/LICENSE

Lines changed: 191 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/golang/glog/README

Lines changed: 44 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)