On Mon, 7 Apr 2008, Fabio M. Di Nitto wrote:
Hi Ryan,it looks like that fence_scsi.pl in master/STABLE2 have somehow diverged from RHEL* branches.In which direction should we merge the changes? Thanks Fabio
I merged the RHEL5 branch into master and STABLE2 like we agreed. From now on you should be able to just edit one of them and cherry pick into the others.
Fabio -- I'm going to make him an offer he can't refuse.