On Mon, Mar 11, 2013 at 11:28:41PM -0400, David Nalley wrote: > On Mon, Mar 11, 2013 at 8:41 PM, Chip Childers > <chip.child...@sungard.com> wrote: > > On Mon, Mar 11, 2013 at 08:11:22PM -0400, David Nalley wrote: > >> Chip, et al: > >> > >> RPM Packaging is currently broken in 4.1 - this fixes CLOUDSTACK-1630 > >> - which doesn't solve the breakage. But once packaging works again, > >> this needs to be applied to fix upgrades. > >> > >> 797eb009e239d904c52de8c5be4cb0c82a63fea4 <-- applied on master > >> > > > > ACK - and applied > > Bah - I put the obsoletes/provides after %description, which doesn't work. > > Please pull > commit d95694871ad7c3c0c5a1ee2dd1c1f6295a5c5de9 > Author: David Nalley <da...@gnsa.us> > Date: Mon Mar 11 23:20:14 2013 -0400 > > CLOUDSTACK-1630 - Actually put obsoletes in the right order > > My apologies for the extra work. > > --David >
You seem to have forgotten to push to master... ;-) git cherry-pick d95694871ad7c3c0c5a1ee2dd1c1f6295a5c5de9 fatal: bad object d95694871ad7c3c0c5a1ee2dd1c1f6295a5c5de9 Go ahead and push to master and then cherry-pick to 4.1 please. -chip
