Merge lp://staging/~ubuntu-branches/ubuntu/oneiric/openafs/oneiric-201305130334 into lp://staging/ubuntu/oneiric/openafs
| Status: | Rejected |
|---|---|
| Rejected by: | James Westby |
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/oneiric/openafs/oneiric-201305130334 |
| Merge into: | lp://staging/ubuntu/oneiric/openafs |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/oneiric/openafs/oneiric-201305130334 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/openafs reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/openafs/oneiric-201305130334. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.
If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https:/
(this is an automatically generated message)
Unmerged revisions
- 33. By Russ Allbery
-
* New upstream stable release.
- Rx NAT pings are not enabled until peer has answered
- Numerous fixes to command argument parsing
- Avoid crashing on host table exhaustion and defer clients instead
- Rx connection reference counting is enabled
- An Rx connection reference count leak is fixed in bulkstat
- Handle unparsable directory objects
- Handle Kerberos credential cache errors in aklog
* Generate stub header files that include the actual system header when
building libuafs instead of symlinking h to the appropriate directory.
Fixes build failures now that Debian has switched to multiarch and
moved some of the system headers. (Closes: #639063, LP #831287)
* Fix another Doxygen call to generate a configuration file, and remove
the generated configuration files after Doxygen runs.
* Update CellServDB to the 2011-08-14 release. - 32. By Russ Allbery
-
* Force use of dblatex to build the manual, even if docbook2pdf is
available, since the latter dies with errors about TeX capacity.
(Closes: #635306)
* Fix generation of protocol documentation from Doxygen headers.
Doxygen cannot be called directly on header files and needs a
configuration file to be generated first. Thanks, Anders Kaseorg.
* Add another dummy rule for ./debian/rules to the kernel module rules
file to fix another variation of make-kpkg breakage. - 31. By Russ Allbery
-
* New upstream prerelease.
- Don't do unnecessary page invalidation with directories.
- Flush vcaches in afs_shutdown for better callback givebacks.
- Fix the vnode type for dynroot FIDs.
- Fix volinfo -filenames.
- Fall back to afs3-vlserver for SRV records for afs3-prserver.
- Fix a client locking issue on ICBS that could deadlock.
- Fix callback state handling with demand-attach when salvaged.
- Fix reference leak in GetCapabilities.
- Document DNS SRV record usage in afsd man page.
* Add a dummy debian/rules rule in the kernel module rules file to fix
builds with make-kpkg. (Closes: #622260)
* Remove and symlink the copies of jquery generated by Doxygen and add a
Recommends on libjs-jquery for openafs-doc.
