[389-ds-base/el4/master: 19/19] Merge branch 'el5' into el4

[Richard Allen Megginson]

commit 42e2fc97f6e166393ec4d33753ee8174e4ccd34a
Merge: d08957d aa787a6
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Aug 10 08:30:33 2010 -0600

    Merge branch 'el5' into el4
    
    Conflicts:
    
    	389-ds-base.spec

 .gitignore               |    2 +-
 389-ds-base-git-local.sh |    2 +-
 389-ds-base-git.sh       |    2 +-
 389-ds-base.spec         |   22 +++++++++++++++++++---
 sources                  |    2 +-
 5 files changed, 23 insertions(+), 7 deletions(-)
---
diff --cc 389-ds-base.spec
index 9eb986a,f83e979..9f1b30c
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@@ -250,8 -341,17 +251,13 @@@ f
  %{_includedir}/%{pkgname}
  %{_libdir}/%{pkgname}/*.so
  
 -%files selinux-devel
 -%defattr(-,root,root,-)
 -%{_datadir}/%{pkgname}-selinux
 -
  %changelog
- * Mon Aug  2 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-0.9.rc6
+ * Tue Aug 10 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-0.11.rc7
+ - 1.2.6 release candidate 7
+ - git tag 389-ds-base-1.2.6.rc7
+ - Bug 621928 - Unable to enable replica (rdn problem?) on 1.2.6 rc6
+ 
+ * Mon Aug  2 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-0.10.rc6
  - 1.2.6 release candidate 6
  - git tag 389-ds-base-1.2.6.rc6
  - Bug 617013 - repl-monitor.pl use cpu upto 90%
@@@ -285,16 -389,21 +295,22 @@@
  * Wed Jun  9 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-0.5.rc1
  - 1.2.6 release candidate 1
  
+ * Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.2.6-0.4.a4.1
+ - Mass rebuild with perl-5.12.0
+ 
  * Wed May 26 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-0.4.a4
  - 1.2.6.a4 release
 +- replace lua code with shell scripts where possible, otherwise, just removed it
  
 -* Tue Apr  7 2010 Nathan Kinder <nkinder at redhat.com> - 1.2.6-0.4.a3
 +* Tue Apr  6 2010 Nathan Kinder <nkinder at redhat.com> - 1.2.6-0.3.a3
  - 1.2.6.a3 release
  - add managed entries plug-in
 +- removed selinux policy since EL4 doesn't support modules
  - many bug fixes
 -- moved selinux subpackage into base package
  
+ * Fri Apr  2 2010 Caolán McNamara <caolanm at redhat.com> - 1.2.6-0.3.a2
+ - rebuild for icu 4.4
+ 
  * Mon Mar  2 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-0.2.a2
  - 1.2.6.a2 release
  - add support for matching rules