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.

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

Inventory: Restrict access from too far away #6745

Closed
wants to merge 2 commits into
base: backport-0.4
from

Conversation

Projects
None yet
4 participants
@sofar
Member

sofar commented Dec 5, 2017

Backport from master

@sofar sofar requested a review from SmallJoker Dec 5, 2017

@rubenwardy

This comment has been minimized.

Show comment
Hide comment
@rubenwardy

rubenwardy Dec 5, 2017

Member

Wrong branch, put into backport-0.4

Member

rubenwardy commented Dec 5, 2017

Wrong branch, put into backport-0.4

@rubenwardy rubenwardy changed the base branch from stable-0.4 to backport-0.4 Dec 5, 2017

@rubenwardy

This comment has been minimized.

Show comment
Hide comment
@rubenwardy

rubenwardy Dec 5, 2017

Member

Also, it's probably better to backport and fixes before this, so we don't miss them

Member

rubenwardy commented Dec 5, 2017

Also, it's probably better to backport and fixes before this, so we don't miss them

@sfan5

This comment has been minimized.

Show comment
Hide comment
@sfan5

sfan5 Dec 5, 2017

Member

That's not how I intended the backports branch to work.
Instead someone should go through all commits from the point at which it was last updated to now, and cherry pick each commit in the correct order. (list is here)

Not doing so might make merging messy and complicates keeping track of what was backported and what wasn't. It gets even worse when you decide that you want to remove a backported commit (and honor the no forcepush rule).

Member

sfan5 commented Dec 5, 2017

That's not how I intended the backports branch to work.
Instead someone should go through all commits from the point at which it was last updated to now, and cherry pick each commit in the correct order. (list is here)

Not doing so might make merging messy and complicates keeping track of what was backported and what wasn't. It gets even worse when you decide that you want to remove a backported commit (and honor the no forcepush rule).

@sfan5

This comment has been minimized.

Show comment
Hide comment
@sfan5

sfan5 Dec 5, 2017

Member

added to branch

Member

sfan5 commented Dec 5, 2017

added to branch

@sfan5 sfan5 closed this Dec 5, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment