[createrepo/f19: 2/2] Merge branch 'master' into f19

[Zdeněk Pavlas]

commit baa3862cee2dbcddd6587991d34a090129e11de9
Merge: beaa76d 273f01c
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Mon Oct 21 11:06:17 2013 +0200

    Merge branch 'master' into f19

 BZ-1021162-workers-default.patch |   25 +++++++++++++++++++++++++
 createrepo.spec                  |    7 ++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --cc createrepo.spec
index 34b077c,cf02e19..58e21b3
--- a/createrepo.spec
+++ b/createrepo.spec
@@@ -57,9 -59,12 +59,12 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitelib}/createrepo
  
  %changelog
+ * Mon Oct 21 2013 Zdenek Pavlas <zpavlas at redhat.com> - 0.10-1
+ - Add workers=1 default back, API users need it. BZ 1021162
+ 
  * Fri Oct 18 2013 Zdenek Pavlas <zpavlas at redhat.com> - 0.10-0
  - update to latest HEAD
 -- Don't spawn more workers that #pkgfiles.
 +- Don't spawn more workers than #pkgfiles.
  - abort if $PWD does not exist. BZ 1001629
  - mergerepo: merge package versions from multiple repos. BZ 1020756
  - mergerepo: --repo option should work with relative paths.