The revenge of the return of 1.1.2

[Stig Sandbeck Mathisen]

Ingvar Hagelund <ingvar at linpro.no> writes:

> Only change needed for Fedora/RedHat: Bump the release number in
> redhat/varnish.spec from 1.1.1 to 1.1.2. Tested on RHEL4 and Fedora
> 8.  On RHEL4, please build with rpmbuild --define "dist el4" ... ,
> to get the rhel4 version of the init scripts.

The redhat/varnish.spec file containing the 1.1.1 revision number is
committed to branches/1.1, but not to trunk.  If I change trunk, I may
not be able to merge.  How do I resolve this in the correct matter?

-- 
Stig Sandbeck Mathisen, Linpro