From a1eaf04e5c25e60ed4ebd997661fc198a2ece9a4 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Oct 05 2011 21:40:17 +0000
Subject: resource limits for simple paged results


resource limits for simple paged results
Bug 740942 - allow resource limits to be set for paged searches independently of limits for other searches/operations
Bug 741744 - MOD operations with chained delete/add get back error 53 on backend config
Bug 742324 - allow nsslapd-idlistscanlimit to be set dynamically and per-user

---

diff --git a/.gitignore b/.gitignore
index dae66a8..7be0ad7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /389-ds-base-1.2.9.9.tar.bz2
 /389-ds-base-1.2.9.10.tar.bz2
 /389-ds-base-1.2.10.a1.tar.bz2
+/389-ds-base-1.2.10.a2.tar.bz2
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index 81bf7a8..e90ffbd 100644
--- a/389-ds-base-git-local.sh
+++ b/389-ds-base-git-local.sh
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.10.a1
+VERSION=1.2.10.a2
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE
diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh
index 8223ac6..59087fb 100644
--- a/389-ds-base-git.sh
+++ b/389-ds-base-git.sh
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.10.a1
+VERSION=1.2.10.a2
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 9f57852..d988f01 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -3,7 +3,7 @@
 # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
 # also remove the space between % and global - this space is needed because
 # fedpkg verrel stupidly ignores comment lines
-%global prerel .a1
+%global prerel .a2
 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
 %global relprefix 0.
 
@@ -19,7 +19,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.10
-Release:          %{?relprefix}1%{?prerel}%{?dist}
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -281,6 +281,11 @@ exit 0
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Wed Oct  5 2011 Rich Megginson <rmeggins@redhat.com> - 1.2.10.a2-0.2
+- Bug 740942 - allow resource limits to be set for paged searches independently of limits for other searches/operations
+- Bug 741744 - MOD operations with chained delete/add get back error 53 on backend config
+- Bug 742324 - allow nsslapd-idlistscanlimit to be set dynamically and per-user
+
 * Wed Sep 21 2011 Rich Megginson <rmeggins@redhat.com> - 1.2.10.a1-0.1
 - Bug 695736 - Providing native systemd file
 
diff --git a/sources b/sources
index e4ca882..f8d52ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-41b3eb17ef6c100fd22c991cd429667c  389-ds-base-1.2.10.a1.tar.bz2
+e85590813dad41c817a80ad9e5c4a38d  389-ds-base-1.2.10.a2.tar.bz2