HomePhorge

Fix for conflict between fileserving streams and none-checksums
3eaf69c4cedeUnpublished

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Fix for conflict between fileserving streams and none-checksums

This was a classic semantic merge conflict; one patch adds a new type of
checksum, with a routine to compute it on files; the other adds streams with
routines to compute all the existing checksum types on them. They merge
cleanly but theresult is incorrect.

This patch completes the square by adding a none_stream routine to not-compute
a checksum on a stream.

Details

Provenance
Markus Roberts <Markus@reality.com>Authored on
test branch <puppet-dev@googlegroups.com>Committed on Feb 17 2010, 3:50 PM
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU2cf7222df889: Fix #3373 - Client side file streaming
Branches
Unknown
Tags
Unknown

Event Timeline

test branch <puppet-dev@googlegroups.com> committed rPU3eaf69c4cede: Fix for conflict between fileserving streams and none-checksums (authored by Markus Roberts <Markus@reality.com>).Feb 17 2010, 3:50 PM