Re: [sepia] "This branch is out-of-date with the base branch"

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi John,

Branch protection is a new GitHub feature, and recently it's enabled
for ceph-qa-suite. Administers of the "ceph" GitHub org can view the
current settings:
https://github.com/ceph/ceph-qa-suite/settings/branches

It looks like someone recently checked the boxes "Require status
checks to pass before merging" and "Require branches to be up to date
before merging".

This means that PRs cannot merge until both conditions are true:
1) the tests must pass
2) master must be in a state where the PR would be a fast-forward merge

Looking at the audit log,
https://github.com/organizations/ceph/settings/audit-log?utf8=%E2%9C%93&q=protected_branch

zmc – protected_branch.update_required_status_checks_enforcement_level
Required status checks for master on ceph/ceph-qa-suite were activated
for non-admins
United States 2 days ago

zmc – required_status_check.create
The status default was marked as required for the branch master on
ceph/ceph-qa-suite
United States 2 days ago

So you can ask Zack about this.

- Ken

On Fri, Jul 29, 2016 at 5:44 AM, John Spray <jspray@xxxxxxxxxx> wrote:
> I've been noticing this status on ceph-qa-suite pull requests, where
> there are no merge conflicts but it was just opened a while ago.
>
> I'm guessing this is either a new github thing or something we
> enabled?  Can anyone shed any light on what makes a PR be considered
> out-of-date?
>
> John
> _______________________________________________
> Sepia mailing list
> Sepia@xxxxxxxxxxxxxx
> http://lists.ceph.com/listinfo.cgi/sepia-ceph.com
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [CEPH Users]     [Ceph Large]     [Information on CEPH]     [Linux BTRFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux