[coreboot-gerrit] Patch merged into coreboot/master: 54e6aa7 util/board_status: Fetch and rebase after failed push

[gerrit at coreboot.org]

the following patch was just integrated into master:
commit 54e6aa7216a6776daa67c94c97d8568e1d395861
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date:   Wed May 20 07:35:56 2015 +0200

    util/board_status: Fetch and rebase after failed push
    
    Currently, when the remote master branch of the board-status
    repository changes between cloning and pushing, `git push origin`
    fails.
    
    This race condition happens quite often with REACTS testing commits at
    the same time on different systems.
    
    If that happens, just download the objects and refs from the
    board-status repository and rebase the local changes on it. Try that
    three times before exiting with an error message.
    
    Change-Id: I628ebce54895f44be6232b622d56acbcc421b847
    Helped-by: Timothy Pearson <tpearson at raptorengineeringinc.com>
    Helped-by: Patrick Georgi <pgeorgi at google.com>
    Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
    Reviewed-on: http://review.coreboot.org/10262
    Reviewed-by: Patrick Georgi <pgeorgi at google.com>
    Tested-by: build bot (Jenkins)
    Reviewed-by: Timothy Pearson <tpearson at raptorengineeringinc.com>


See http://review.coreboot.org/10262 for details.

-gerrit