Merge ~vpa1977/ubuntu/+source/nfs-utils:merge-lp2030474 into ubuntu/+source/nfs-utils:ubuntu/devel
Proposed by
Vladimir Petko
Status: | Superseded | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Proposed branch: | ~vpa1977/ubuntu/+source/nfs-utils:merge-lp2030474 | ||||||||||||
Merge into: | ubuntu/+source/nfs-utils:ubuntu/devel | ||||||||||||
Diff against target: |
7868 lines (+3596/-520) (has conflicts) 128 files modified
.gitignore (+3/-0) Makefile.in (+2/-1) NEWS (+11/-11) README (+8/-8) configure (+277/-54) configure.ac (+15/-16) debian/changelog (+102/-0) debian/control (+3/-2) debian/copyright (+0/-1) debian/nfs-common.bug-script (+6/-6) debian/nfs-common.default (+0/-7) debian/nfs-common.init (+4/-5) debian/nfs-common.install (+0/-1) debian/nfs-common.lintian-overrides (+3/-3) debian/nfs-common.postinst (+0/-23) debian/nfs-kernel-server.bug-script (+4/-4) debian/nfs-kernel-server.default (+0/-13) debian/nfs-kernel-server.init (+6/-8) debian/nfs-kernel-server.install (+2/-0) debian/nfs-kernel-server.lintian-overrides (+2/-2) debian/nfs-kernel-server.postinst (+7/-6) debian/patches/always-run-generator.patch (+5/-0) debian/patches/fsidd-provide-better-default-socket-name.patch (+96/-0) debian/patches/libnfsidmap-try-to-get-the-domain-directly-from-host.patch (+54/-0) debian/patches/nfs-idmapd.service-add-network-online.target-to-Want.patch (+33/-0) debian/patches/series (+10/-0) debian/patches/start-statd-fix-shellcheck-warnings.patch (+41/-0) debian/rules (+7/-1) debian/salsa-ci.yml (+14/-0) dev/null (+0/-16) linux-nfs/Makefile.in (+2/-1) support/Makefile.am (+1/-1) support/Makefile.in (+4/-3) support/export/Makefile.am (+2/-0) support/export/Makefile.in (+209/-46) support/export/auth.c (+1/-1) support/export/cache.c (+95/-14) support/export/client.c (+3/-0) support/export/export.c (+20/-0) support/export/v4clients.c (+1/-1) support/export/v4root.c (+3/-1) support/export/xtab.c (+1/-1) support/include/Makefile.in (+2/-1) support/include/nfs/Makefile.in (+2/-1) support/include/nfs/export.h (+14/-0) support/include/nfsd_path.h (+3/-3) support/include/nfslib.h (+15/-0) support/include/pseudoflavors.h (+1/-0) support/include/rpcsvc/Makefile.in (+2/-1) support/include/sys/Makefile.in (+2/-1) support/include/sys/fs/Makefile.in (+2/-1) support/junction/Makefile.in (+2/-1) support/junction/junction.c (+5/-5) support/misc/Makefile.in (+2/-1) support/misc/nfsd_path.c (+12/-12) support/nfs/Makefile.am (+1/-0) support/nfs/Makefile.in (+213/-71) support/nfs/exports.c (+161/-15) support/nfs/xlog.c (+5/-2) support/nfsidmap/Makefile.in (+2/-1) support/nfsidmap/regex.c (+1/-1) support/nsm/Makefile.in (+2/-1) support/reexport/Makefile.am (+18/-0) support/reexport/Makefile.in (+797/-0) support/reexport/backend_sqlite.c (+267/-0) support/reexport/fsidd.c (+198/-0) support/reexport/reexport.c (+326/-0) support/reexport/reexport.h (+18/-0) support/reexport/reexport_backend.h (+47/-0) systemd/60-nfs.rules (+21/-0) systemd/Makefile.am (+10/-10) systemd/Makefile.in (+14/-11) systemd/auth-rpcgss-module.service (+2/-1) systemd/fsidd.service (+10/-0) systemd/nfs-server.service (+1/-1) systemd/nfs.conf.man (+7/-0) tests/Makefile.in (+2/-1) tests/nsm_client/Makefile.in (+2/-1) tools/Makefile.am (+5/-1) tools/Makefile.in (+6/-4) tools/locktest/Makefile.in (+2/-1) tools/mountstats/Makefile.in (+2/-1) tools/nfs-iostat/Makefile.in (+2/-1) tools/nfs-iostat/nfs-iostat.py (+9/-6) tools/nfsconf/Makefile.in (+2/-1) tools/nfsdclddb/Makefile.in (+2/-1) tools/nfsdclnts/Makefile.in (+2/-1) tools/nfsrahead/Makefile.am (+1/-1) tools/nfsrahead/Makefile.in (+3/-2) tools/nfsrahead/main.c (+1/-1) tools/nlmtest/Makefile.in (+2/-1) tools/rpcctl/Makefile.in (+2/-1) tools/rpcdebug/Makefile.in (+2/-1) tools/rpcdebug/rpcdebug.c (+1/-1) tools/rpcgen/Makefile.in (+2/-1) utils/Makefile.in (+2/-1) utils/blkmapd/Makefile.in (+2/-1) utils/blkmapd/device-discovery.c (+36/-29) utils/blkmapd/device-discovery.h (+2/-0) utils/blkmapd/device-inq.c (+2/-2) utils/exportd/Makefile.am (+3/-1) utils/exportd/Makefile.in (+7/-4) utils/exportfs/Makefile.am (+3/-0) utils/exportfs/Makefile.in (+25/-8) utils/exportfs/exportfs.c (+16/-4) utils/exportfs/exports.man (+81/-1) utils/gssd/Makefile.in (+2/-1) utils/idmapd/Makefile.in (+2/-1) utils/idmapd/idmapd.c (+1/-1) utils/mount/Makefile.am (+2/-1) utils/mount/Makefile.in (+9/-4) utils/mount/error.c (+16/-15) utils/mount/network.c (+1/-1) utils/mount/nfs.man (+33/-1) utils/mount/nfsmount.conf (+3/-3) utils/mount/parse_dev.c (+2/-1) utils/mountd/Makefile.am (+2/-0) utils/mountd/Makefile.in (+5/-3) utils/nfsd/Makefile.in (+2/-1) utils/nfsd/nfsd.c (+16/-1) utils/nfsd/nfsd.man (+15/-2) utils/nfsdcld/Makefile.in (+2/-1) utils/nfsdcltrack/Makefile.in (+2/-1) utils/nfsidmap/Makefile.in (+2/-1) utils/nfsref/Makefile.in (+2/-1) utils/nfsstat/Makefile.in (+2/-1) utils/showmount/Makefile.in (+2/-1) utils/statd/Makefile.in (+2/-1) Conflict in debian/changelog Conflict in debian/patches/always-run-generator.patch Conflict in debian/patches/series Conflict in debian/rules |
||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
git-ubuntu import | Pending | ||
Review via email: mp+448654@code.staging.launchpad.net |
Description of the change
Merge of nfs-utils 2.1.6
Summary of changes:
- rebased existing commits
- dropped patch integrated upstream.
PPA: ppa:vpa1977/
[1] https:/
To post a comment you must log in.
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.