Merge lp://staging/~l3on/ubuntu/quantal/smbldap-tools/merge into lp://staging/debian/smbldap-tools

Proposed by Leo Iannacone
Status: Needs review
Proposed branch: lp://staging/~l3on/ubuntu/quantal/smbldap-tools/merge
Merge into: lp://staging/debian/smbldap-tools
Diff against target: 3048 lines (+2421/-556)
8 files modified
.pc/0001_debian_nobody.patch/smbldap-populate.pl (+0/-553)
.pc/applied-patches (+0/-1)
debian/changelog (+28/-0)
debian/control (+2/-1)
debian/patches/0020_original_doc_html_index.patch (+2369/-0)
debian/patches/0021_smbldap-useradd_flush_nscd_cache.patch (+19/-0)
debian/patches/series (+2/-0)
smbldap-populate.pl (+1/-1)
To merge this branch: bzr merge lp://staging/~l3on/ubuntu/quantal/smbldap-tools/merge
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+125754@code.staging.launchpad.net

Description of the change

To post a comment you must log in.

Unmerged revisions

9. By Leo Iannacone

* Merge from debian unstable (LP: #1054130). Remaining chagnes:
  - Apply patch from rdratlos to resolve being unable to join a Windows
    7 or Windows 2008 machine to a Samba domain due to the use of cached
    nss credentials. (LP: #814898)
  - 0020_original_doc_html_index.patch: Add index html file.
* New upstream release (Closes: #647860, #679935, #680939, #681350)
* Previous upstream version closes: #670246
* Bumped standard version (no changes needed)

8. By Leo Iannacone

* Merge from debian unstable (LP: #889308). Remaining changes:
  - Apply patch from rdratlos to resolve being unable to join a Windows
    7 or Windows 2008 machine to a Samba domain due to the use of cached
    nss credentials. (LP: #814898)
  - 0020_original_doc_html_index.patch: Add index html file.

7. By Daniel T Chen

Apply patch from rdratlos to resolve being unable to join a Windows
7 or Windows 2008 machine to a Samba domain due to the use of cached
nss credentials. (LP: #814898)

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

to all changes: