[389-ds-base/f17] - Ticket 340 - Change on SLAPI_MODRDN_NEWSUPERIOR is not evaluated in acl - Ticket 446 - anonymous l

[Noriko Hosoi]

commit b068c1a2c1ccafe333e1fe9f51470efbbead1dbf
Author: Noriko Hosoi <nhosoi at totoro.usersys.redhat.com>
Date:   Wed Oct 10 11:04:55 2012 -0700

    - Ticket 340 - Change on SLAPI_MODRDN_NEWSUPERIOR is not evaluated in acl
    - Ticket 446 - anonymous limits are being applied to directory manager
    - Ticket 478 - passwordTrackUpdateTime stops working with subtree password policies
    - Ticket 481 - expand nested posix groups
    - Ticket 485 - Dirsrv deadlock locking up IPA

 .gitignore       |    1 +
 389-ds-base.spec |   20 +++++++++-----------
 sources          |    2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b105b76..41da5e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@
 /389-ds-base-1.2.11.13.tar.bz2
 /389-ds-base-1.2.11.14.tar.bz2
 /389-ds-base-1.2.11.15.tar.bz2
+/389-ds-base-1.2.11.16.tar.bz2
diff --git a/389-ds-base.spec b/389-ds-base.spec
index b2693d1..0a1652f 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -21,7 +21,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.11.15
+Version:          1.2.11.16
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -311,8 +311,15 @@ fi
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Wed Oct 10 2012 Noriko Hosoi <nhosoi at redhat.com> - 1.2.11.16-1
+- Ticket 340 - Change on SLAPI_MODRDN_NEWSUPERIOR is not evaluated in acl
+- Ticket 446 - anonymous limits are being applied to directory manager
+- Ticket 478 - passwordTrackUpdateTime stops working with subtree password policies
+- Ticket 481 - expand nested posix groups
+- Ticket 485 - Dirsrv deadlock locking up IPA
+
 * Tue Sep 25 2012 Rich Megginson <rmeggins at redhat.com> - 1.2.11.15-1
-- Trac Ticket #470 - 389 prevents from adding a posixaccount with userpassword after schema reload
+- Ticket 470 - 389 prevents from adding a posixaccount with userpassword after schema reload
 - Ticket 477 - CLEANALLRUV if there are only winsync agmts task will hang
 - Ticket 457 - dirsrv init script returns 0 even when few or all instances fail to start
 - Ticket 473 - change VERSION.sh to have console version be major.minor
@@ -396,15 +403,12 @@ Ticket #406 - Impossible to rename entry (modrdn) with Attribute Uniqueness plug
 Ticket #405 - referint modrdn not working if case is different
 Ticket 399 - slapi_ldap_bind() doesn't check bind results
 
-<<<<<<< HEAD
-=======
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.11.7-2.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
 * Thu Jun 28 2012 Petr Pisar <ppisar at redhat.com> - 1.2.11.7-2.1
 - Perl 5.16 rebuild
 
->>>>>>> master
 * Wed Jun 27 2012 Rich Megginson <rmeggins at redhat.com> - 1.2.11.7-2
 - Ticket 378 - unhashed#user#password visible after changing password
 -  fix func declaration from previous patch
@@ -418,12 +422,9 @@ Ticket 399 - slapi_ldap_bind() doesn't check bind results
 - Ticket #378 - unhashed#user#password visible after changing password
 - Ticket #365 - passwords in clear text in the audit log
 
-<<<<<<< HEAD
-=======
 * Tue Jun 19 2012 Rich Megginson <rmeggins at redhat.com> - 1.2.11.5-2
 - workaround for https://bugzilla.redhat.com/show_bug.cgi?id=833529
 
->>>>>>> master
 * Mon Jun 18 2012 Rich Megginson <rmeggins at redhat.com> - 1.2.11.5-1
 - Ticket #387 - managed entry sometimes doesn't delete the managed entry
 - 5903815 improve txn test index handling
@@ -435,12 +436,9 @@ Ticket 399 - slapi_ldap_bind() doesn't check bind results
 - Ticket 368 - Make the cleanAllRUV task one step
 - Ticket #110 - RFE limiting root DN by host, IP, time of day, day of week
 
-<<<<<<< HEAD
-=======
 * Mon Jun 11 2012 Petr Pisar <ppisar at redhat.com> - 1.2.11.4-1.1
 - Perl 5.16 rebuild
 
->>>>>>> master
 * Tue May 22 2012 Rich Megginson <rmeggins at redhat.com> - 1.2.11.4-1
 - Ticket #360 - ldapmodify returns Operations error
 - Ticket #321 - krbExtraData is being null modified and replicated on each ssh login
diff --git a/sources b/sources
index 4a7e024..10ee585 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae6bc25834728bcd9dd96ef82094c2bd  389-ds-base-1.2.11.15.tar.bz2
+2ab89293ce8e1b91e3324b193c68dfeb  389-ds-base-1.2.11.16.tar.bz2