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

Proposed by Mahyuddin Susanto
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  Approve
Ubuntu Development Team Pending
Ubuntu Sponsors Pending
Matthew East Pending
Ubuntu Documentation Committers 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.
Revision history for this message
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
Revision history for this message
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
=== modified file 'debian/changelog'
--- debian/changelog 2010-09-19 10:43:54 +0000
+++ debian/changelog 2010-12-06 17:34:27 +0000
@@ -1,3 +1,10 @@
1ubuntu-docs (10.10.4) maverick-proposed; urgency=low
2
3 * ldif at openldap installation is broken (LP: #677998)
4 + serverguide/C/network-auth.xml
5
6 -- Mahyuddin Susanto <udienz@gmail.com> Mon, 06 Dec 2010 22:59:57 +0700
7
1ubuntu-docs (10.10.3) maverick; urgency=low8ubuntu-docs (10.10.3) maverick; urgency=low
29
3 * Amend font-family for browser startpage (LP: #195590)10 * Amend font-family for browser startpage (LP: #195590)
411
=== modified file 'serverguide/C/network-auth.xml'
--- serverguide/C/network-auth.xml 2010-08-18 17:39:46 +0000
+++ serverguide/C/network-auth.xml 2010-12-06 17:34:27 +0000
@@ -126,7 +126,7 @@
126objectClass: olcModuleList126objectClass: olcModuleList
127cn: module127cn: module
128olcModulepath: /usr/lib/ldap128olcModulepath: /usr/lib/ldap
129olcModuleload: back_hdb129olcModuleload: back_hdb.la
130130
131# Database settings131# Database settings
132dn: olcDatabase=hdb,cn=config132dn: olcDatabase=hdb,cn=config
@@ -727,7 +727,7 @@
727objectClass: olcModuleList727objectClass: olcModuleList
728cn: module728cn: module
729olcModulepath: /usr/lib/ldap729olcModulepath: /usr/lib/ldap
730olcModuleload: back_hdb730olcModuleload: back_hdb.la
731731
732# Database settings732# Database settings
733dn: olcDatabase=hdb,cn=config733dn: olcDatabase=hdb,cn=config

Subscribers

People subscribed via source and target branches