Ubuntu
autofs package

Merge ~ahasenack/ubuntu/+source/autofs:mantic-autofs-merge-2 into ubuntu/+source/autofs:debian/sid

  1. Git
  2. lp:~ahasenack/ubuntu/+source/autofs
  3. mantic-autofs-merge-2
  4. Merge into debian/sid
Proposed by Andreas Hasenack
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merge reported by: git-ubuntu bot
Merged at revision: cd3e5718894a492e029c142e8f1fe04531e34d04
Proposed branch: ~ahasenack/ubuntu/+source/autofs:mantic-autofs-merge-2
Merge into: ubuntu/+source/autofs:debian/sid
Diff against target: 1546 lines (+1438/-2)
13 files modified
debian/changelog (+128/-0)
debian/control (+2/-1)
debian/patches/autofs-5.1.8-ldap_sasl_interactive_bind-needs-credentials-for-auto-detection.patch (+118/-0)
debian/patches/autofs-5.1.8-let-OpenLDAP-handle-SASL-binding.patch (+422/-0)
debian/patches/autofs-5.1.8-prepare-for-OpenLDAP-SASL-binding.patch (+221/-0)
debian/patches/autofs-5.1.8-support-SCRAM-for-SASL-binding.patch (+84/-0)
debian/patches/fix-loop-under-run-in-cache_get_offset_parent.patch (+30/-0)
debian/patches/ntlm-crammd5-require-credentials.patch (+16/-0)
debian/patches/series (+7/-0)
debian/patches/support-external-cc-for-gssapi-bind.patch (+20/-0)
debian/tests/control (+4/-0)
debian/tests/ldap-map-sasl-auth (+385/-0)
debian/tests/smb-mount (+1/-1)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Robie Basak Approve
Canonical Server Reporter Pending
Review via email: mp+449055@code.staging.launchpad.net

Description of the change

Second autofs merge from debian.

Dropped one patch, and squashed our delta in logical. The noise in range-diff is d/p/series and changes in commit messages:

  git range-diff old/debian..logical/5.1.8-2ubuntu2 new/debian..mantic-autofs-merge-2

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/autofs-merge/

DEP8: green (note all-proposed=1 had to be used, due to the current glibc migration in mantic)

To post a comment you must log in.
Revision history for this message
Robie Basak (racb) wrote :

I'll take a look.

Revision history for this message
Robie Basak (racb) wrote :

Everything looks rebased exactly with commit message improvements apart from the one commit correctly dropped. Commit messages and changelog messages are accurate. I wondered if b0027d6 had been sent to Debian as I could find no trace of this, but perhaps this is because it's associated with fbbcde8 and you're waiting for both together? Apart from that, everything looks appropriate to remain in our delta and upstreaming status all seems appropriate.

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

Approvers: ahasenack, racb
Uploaders: ahasenack, racb
MP auto-approved

review: Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Thanks, uploaded with rich history:

Uploading autofs_5.1.8-3.1ubuntu1.dsc
Uploading autofs_5.1.8-3.1ubuntu1.debian.tar.xz
Uploading autofs_5.1.8-3.1ubuntu1_source.buildinfo
Uploading autofs_5.1.8-3.1ubuntu1_source.changes

I'll see about that echo;echo|smbpasswd delta.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches