From 0934137585f5d737d2785cf9bb2a316a30830d04 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Apr 09 2013 19:16:17 +0000 Subject: Merge branch 'f17' of ssh://pkgs.fedoraproject.org/389-ds-base into f17 Conflicts: .gitignore 389-ds-base-git-local.sh 389-ds-base-git.sh 389-ds-base.spec sources --- diff --git a/.gitignore b/.gitignore index 5ae9417..1a63eb0 100644 --- a/.gitignore +++ b/.gitignore @@ -61,4 +61,5 @@ /389-ds-base-1.2.11.17.tar.bz2 /389-ds-base-1.2.11.18.tar.bz2 /389-ds-base-1.2.11.19.tar.bz2 +/389-ds-base-1.2.11.20.tar.bz2 /389-ds-base-1.2.11.21.tar.bz2 diff --git a/389-ds-base.spec b/389-ds-base.spec index c969f48..849d678 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -315,8 +315,7 @@ fi 9a7ba7d bump verison to 1.2.11.21 Ticket 47318 - server fails to start after upgrade(schema error) -* Wed Mar 28 2013 Noriko Hosoi - 1.2.11.20-1 -46bfabb bump version to 1.2.11.20 +* Thu Mar 28 2013 Noriko Hosoi - 1.2.11.20-1 Ticket 623 - cleanAllRUV task fails to cleanup config upon completion Ticket #47308 - unintended information exposure when anonymous access is set to rootdse Ticket 628 - crash in aci evaluation diff --git a/sources b/sources index 46e65a7..97c2f15 100644 --- a/sources +++ b/sources @@ -1 +1,5 @@ +<<<<<<< HEAD 1b577e7ab20ff94c2b63f43d5b651208 389-ds-base-1.2.11.21.tar.bz2 +======= +ee5e57fa0e28a2d4ec67fa5b1162c306 389-ds-base-1.2.11.20.tar.bz2 +>>>>>>> d19c9a38e234998adb6a7823e49ab9fe75f7650e