[Gerald Combs <gerald@xxxxxxxxxxxx>]

ronnie sahlberg wrote:
> Gerald,
> 
> Can you add 18002 to the release branch?
> 
> It is a very safe patch with very little risk of destabilizing the code.
> 
> It fixes an issue where version 4 of NDMP has dropped a parameter for
> two function calls   which resulted in these PDUs as showing up as
> malformed in ethereal.

Done.

> I would eventually want to see the recent fc/fcp/iscsi/scsi changes in
> a release version as well    but the changes made are quite extensive
> and intrusive.
> When 0.99 is out,   will you sync upp all changes from trunk to the
> release branch   or will this happen after the 1.0 release?
> (no urgency for me,   i just point my users to the buildbot builds  
> and that is fine for us)

The only changes that should be copied from /trunk to /trunk-1.0 are bug
fixes (including security fixes) and anything that achieves the
milestones listed on the roadmap page.  Ulf asked if periodic developer
releases could be created from the trunk.  Would that be sufficient?