Merge lp:~udienz/ubuntu-docs/natty-ubuntu-docs.fix677998 into lp:ubuntu-docs/natty

Proposed by Mahyuddin Susanto on 2010-12-06
Status: Merged
Merged at revision: 598
Proposed branch: lp:~udienz/ubuntu-docs/natty-ubuntu-docs.fix677998
Merge into: lp:ubuntu-docs/natty
Diff against target: 36 lines (+9/-2)
2 files modified
debian/changelog (+7/-0)
serverguide/C/network-auth.xml (+2/-2)
To merge this branch: bzr merge lp:~udienz/ubuntu-docs/natty-ubuntu-docs.fix677998
Reviewer Review Type Date Requested Status
Dustin Kirkland  (community) 2010-12-08 Approve on 2010-12-08
Ubuntu Development Team 2010-12-10 Pending
Ubuntu Sponsors Team 2010-12-10 Pending
Matthew East 2010-12-08 Pending
Ubuntu Documentation Committers 2010-12-06 Pending
Review via email: mp+42857@code.launchpad.net

Description of the change

* ldif at openldap installation is broken (LP: #677998)

To post a comment you must log in.
Dustin Kirkland  (kirkland) wrote :

Looks good to me. Merging and pushing to bzr. I wasn't able to get it built though (can't seem to create the orig.tar.gz correctly).

I changed the release in the changelog to "UNRELEASED". Perhaps Matthew or someone can build it and upload it correctly. Thanks!

review: Approve
Dustin Kirkland  (kirkland) wrote :

Well, nevermind, I don't have write permission to lp:ubuntu-docs. Oh well...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-09-19 10:43:54 +0000
3+++ debian/changelog 2010-12-06 17:34:27 +0000
4@@ -1,3 +1,10 @@
5+ubuntu-docs (10.10.4) maverick-proposed; urgency=low
6+
7+ * ldif at openldap installation is broken (LP: #677998)
8+ + serverguide/C/network-auth.xml
9+
10+ -- Mahyuddin Susanto <udienz@gmail.com> Mon, 06 Dec 2010 22:59:57 +0700
11+
12 ubuntu-docs (10.10.3) maverick; urgency=low
13
14 * Amend font-family for browser startpage (LP: #195590)
15
16=== modified file 'serverguide/C/network-auth.xml'
17--- serverguide/C/network-auth.xml 2010-08-18 17:39:46 +0000
18+++ serverguide/C/network-auth.xml 2010-12-06 17:34:27 +0000
19@@ -126,7 +126,7 @@
20 objectClass: olcModuleList
21 cn: module
22 olcModulepath: /usr/lib/ldap
23-olcModuleload: back_hdb
24+olcModuleload: back_hdb.la
25
26 # Database settings
27 dn: olcDatabase=hdb,cn=config
28@@ -727,7 +727,7 @@
29 objectClass: olcModuleList
30 cn: module
31 olcModulepath: /usr/lib/ldap
32-olcModuleload: back_hdb
33+olcModuleload: back_hdb.la
34
35 # Database settings
36 dn: olcDatabase=hdb,cn=config

Subscribers

People subscribed via source and target branches