Merge lp://staging/~lamont/maas/bug-1553176-1.9 into lp://staging/maas/1.9
Proposed by
LaMont Jones
Status: | Merged |
---|---|
Approved by: | Mike Pontillo |
Approved revision: | no longer in the source branch. |
Merged at revision: | 4598 |
Proposed branch: | lp://staging/~lamont/maas/bug-1553176-1.9 |
Merge into: | lp://staging/maas/1.9 |
Diff against target: |
210 lines (+32/-116) 2 files modified
src/provisioningserver/utils/fs.py (+16/-62) src/provisioningserver/utils/tests/test_fs.py (+16/-54) |
To merge this branch: | bzr merge lp://staging/~lamont/maas/bug-1553176-1.9 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mike Pontillo (community) | Approve | ||
Review via email: mp+316384@code.staging.launchpad.net |
Commit message
Backport parts of r4750 from trunk: BIND compares zone file mtime to last load time and skips the load when the file is older, so our approach to slowly incrementing mtime breaks.
Description of the change
Stop trying to be smarter than BIND about zonefile modification times, since it uses last-load-time and file mtime to determine whether or not it's already loaded.
To post a comment you must log in.
Looks good; let's wait to land this until the new version of bind makes it from -proposed to -updates.