Merge branch 'problame/zfs-command-logging-and-status' into problame/holds-release-and-hold-leak-fix-v2
This commit is contained in:
@@ -59,6 +59,9 @@ func parseHumanFormatterNodate(line string) (l RuntimeLine, err error) {
|
|||||||
default:
|
default:
|
||||||
return l, errors.Errorf("unknown key %q", k)
|
return l, errors.Errorf("unknown key %q", k)
|
||||||
}
|
}
|
||||||
|
if err != nil {
|
||||||
|
return l, err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if d.Err() != nil {
|
if d.Err() != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user