[puppet: 2/2] Resolve merge conflict from mass rebuild

Michael Stahnke stahnma at fedoraproject.org
Wed Feb 27 22:45:45 UTC 2013

Previous message: [puppet: 1/2] Update rawhide to 3.1.0
Next message: [kernel/f17] Update ARM config to enable SPI and a few other cleanups
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit ebf700d44944b737d97a7b0df998664061808edc
Merge: 3194a84 986d96a
Author: Michael Stahnke <stahnma at puppetlabs.com>
Date:   Wed Feb 27 14:45:21 2013 -0800

    Resolve merge conflict from mass rebuild

---

Previous message: [puppet: 1/2] Update rawhide to 3.1.0
Next message: [kernel/f17] Update ARM config to enable SPI and a few other cleanups
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the scm-commits mailing list