Merge branch 'master' into f13

2011-04-06 16:03:09 -04:00 · 2011-04-06 16:03:09 -04:00 · 4612cb12e7
commit 4612cb12e7
parent 58d9b4d42a e73f356cb7
3 changed files with 10 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,3 +13,4 @@ slapi-nis-0.17.tar.gz
 /slapi-nis-0.20.tar.gz
 /slapi-nis-0.21.tar.gz
 /slapi-nis-0.22.tar.gz
+/slapi-nis-0.23.tar.gz
--- a/slapi-nis.spec
+++ b/slapi-nis.spec
@ -5,7 +5,7 @@
 %endif

 Name:		slapi-nis
-Version:	0.22
+Version:	0.23
 Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
@ -57,6 +57,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/nisserver-plugin-defs

 %changelog
+* Thu Mar 31 2011 Nalin Dahyabhai <nalin@redhat.com> - 0.23-1
+- speed up building compat entries with attributes with thousands of literal
+  values (#692690)
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.22-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Thu Jan  6 2011 Nalin Dahyabhai <nalin@redhat.com> - 0.22-1
 - fix a number of scanner-uncovered defects

--- a/2
+++ b/2
@ -1 +1 @@
-f72724d7c04559cb959b2e81d8bf305a  slapi-nis-0.22.tar.gz
+c7b3482d2d6a0ba7d8310c9247eb37e1  slapi-nis-0.23.tar.gz