Skip to content

Marathon 1.1.2 and Mesos 1.0.*#134

Merged
solarkennedy merged 5 commits intothefactory:masterfrom
nhandler:marathon-1.1.2
Aug 3, 2016
Merged

Marathon 1.1.2 and Mesos 1.0.*#134
solarkennedy merged 5 commits intothefactory:masterfrom
nhandler:marathon-1.1.2

Conversation

@nhandler
Copy link
Copy Markdown
Contributor

@nhandler nhandler commented Aug 3, 2016

While attempting to run the itests locally to test Marathon 1.1.2 support, I ran into an issue where tox was unable to install the requests module. This appears to be due to the fact that pip install --upgrade will upgrade the requests<2.7 that was previously installed when it goes to install requests-mock which has a dependency on requests.

The Dockerfile was also not running apt-get update prior to the first install, which was causing apt to be unable to install the package.

I also went ahead and bumped up the version of mesos we are installing from 0.23.* to 1.0.*, which required explicitly setting the MESOS_WORK_DIR due to https://issues.apache.org/jira/browse/MESOS-5064.

Finally, I did a little bit of cleanup.

@solarkennedy
Copy link
Copy Markdown
Contributor

Whoa!

@solarkennedy solarkennedy merged commit 003064b into thefactory:master Aug 3, 2016
@solarkennedy
Copy link
Copy Markdown
Contributor

Thanks!

@nhandler nhandler deleted the marathon-1.1.2 branch August 3, 2016 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants