Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mergebot Train - May 4th #2846

Merged
merged 37 commits into from May 8, 2018
Merged

Mergebot Train - May 4th #2846

merged 37 commits into from May 8, 2018

Conversation

orsenthil
Copy link
Contributor

@orsenthil orsenthil commented May 4, 2018 •
edited

High-level description

kensipe and others added 27 commits February 13, 2018 15:56
@kensipe
accessability to zk is requirement for a marathon start
07cd158
@kensipe
correction to the name of zk name
fed5a80
@karya0
Increase executor reregistration timeout to 10 seconds.
1bbbb8d 
In cases where the agent node is under heavy load, it can take more than
2 seconds (default executor reregistation timeout) for all executors
to reregister with an agent that just failed over. After the timeout,
the executors are explicitly removed and the tasks are marked as
TASK_GONE.
@karya0
Merge branch 'master' into kapil/executor_reregistration_timeout
a01c031
@mesosphere-ci
Bumped Mesos to a1c6a7a.
fe9bf10
@urbanserj
Update mesos-modules
ec029a5
@urbanserj
Add validation for vtep_mtu
8c12bcf
@urbanserj
Bump dcos-net
0cb0561
@rukletsov
Add owners from the Mesos pool of committers.
6e0f5e7
Add checks for ftype=1 for docker and mesos directories if using XFS
2649ac4
Simplified docker root dir detection and removed hardcoded /var/lib/d…
5ecdb07 
…ocker check
Escape docker info syntax to not collide with gen.template variable s…
184405c 
…yntax
Fix logic for checking /var/lib and added some whitespace
0bf6c6d
Use mesos_agent_work_dir instead of /var/lib/mesos
c8a1018
Docker 1.12 does not support -f for docker info
8ff277f
Fixed typos
23eae70
Remove unecessary parent directory check
1c72e4e
Readability improvements
eeb1cfd
@branden
Fail advanced install script if ifconfig is not available
525d7ca
@branden
Bump dcos-checks
3f840ee
@branden
Add ifconfig to poststart node checks
6303a1d
@urbanserj
Add /etc/dcos.network
89d8ca1
@urbanserj
Add networkd command
eecf6a3
@urbanserj
Mark dcos-net ip links as unmanaged
05f727f
@urbanserj
Move networkd helper to dcos-net-setup
77fa78c
@branden @urbanserj
Fix flask-compress import
847ed73 
flask.ext.compress moved to flask_compress.
@margaret
remove owners who no longer work at mesosphere
9ed4943
@mesosphere-mergebot-dev
Copy link

This repo has @mesosphere-mergebot integration. You can interact with the following commands.

@mesosphere-mergebot merge-it  
@mesosphere-mergebot bump-ee  
@mesosphere-mergebot override-status  
@mesosphere-mergebot label [Ship It |Work In Progress |Ready For Review |Request For Comment |Holding]
  • PR creators can apply one of [Ready For Review |Work In Progress]. Owners can apply any label.

@dcos dcos deleted a comment from d2iq-mergebot May 7, 2018
@d2iq-mergebot
Copy link
Collaborator

d2iq-mergebot commented May 7, 2018 •
edited by orsenthil

Enterprise Bump https://github.com/mesosphere/dcos-enterprise/pull/2721 updated.

@dcos dcos deleted a comment from d2iq-mergebot May 7, 2018
@orsenthil orsenthil requested a review from gpaul May 7, 2018 03:56
@orsenthil
Copy link
Contributor Author

Hi @gpaul / @jgehrcke / @adamtheturtle - Please ensure if we need to add any thing to CHANGES.md. I tried pinging individual PRs to determine and we didn't have anything. Additional review will be helpful.

@gpaul
Copy link
Contributor

gpaul commented May 7, 2018

It looks OK to me, but I'm vague on what constitutes "notable changes." The heuristic I use is "If I was operating DC/OS, would I want to know about this commit?" These changes seem mostly internal to me.

gpaul
gpaul approved these changes May 7, 2018
View reviewed changes
Copy link
Contributor

@gpaul gpaul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@gpaul
Copy link
Contributor

gpaul commented May 7, 2018

@mesosphere-mergebot override-status teamcity/dcos/test/docker/smoke https://jira.mesosphere.com/browse/DCOS_OSS-1902

@orsenthil
Copy link
Contributor Author

@mesosphere-mergebot label ready for review

Revert "Merge dcos#2808"
3251c40 
This reverts commit 9358a13, reversing
changes made to 2d347c4.
@orsenthil
Copy link
Contributor Author

@mesosphere-mergebot bump-ee

@orsenthil
Copy link
Contributor Author

Reverted - * [master] Bump Mesos to nightly master a1c6a7a #2808

@d2iq-mergebot
Copy link
Collaborator

Enterprise Bump updated.

@jgehrcke
Copy link
Contributor

jgehrcke commented May 8, 2018

@mesosphere-mergebot merge-it

@d2iq-mergebot
Copy link
Collaborator

Enterprise Bump PR , and the current PR #2846 are now merged.

@d2iq-mergebot d2iq-mergebot merged commit 3251c40 into dcos:master May 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gpaul gpaul gpaul approved these changes

@urbanserj urbanserj urbanserj approved these changes

Assignees
No one assigned
Labels
Ship It
Projects
None yet
Milestone
No milestone