[mock: 2/2] Merge remote-tracking branch 'origin/master'

[John Clark Williams]

commit ad7d17c6563e07b7cd26d72292caa5897f66cb01
Merge: f3eaee2 d296a86
Author: Clark Williams <clark.williams at gmail.com>
Date:   Thu Jul 17 16:12:18 2014 -0500

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	mock.spec

 mock.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc mock.spec
index c39c92f,2c95ac0..e732835
--- a/mock.spec
+++ b/mock.spec
@@@ -157,23 -144,9 +157,26 @@@ ln -s -f $cfg %{_sysconfdir}/%{name}/de
  %{python_sitelib}/mockbuild/scm.py*
  
  %changelog
 +* Thu Jul 10 2014 Clark Williams <williams at redhat.com> - 1.1.40-1
 +- from Miroslav Suchý <msuchy at redhat.com>:
 +  - mock: Revert "revert 7ec6a1e9d202ab56fb31c914dbf7516c045e56ab" [BZ# 1103239]
 +  - configs: use final Centos 7 path in configs [BZ# 1108402]
 +  - configs: fix typo in fedora-rawhide-armhfp config [BZ# 1108847]
 +  - mockchain: use getuid() instead of getgid() [BZ# 1108265]
 +  - configs: check gpg key of packages from Fedora, Centos, Epel
 +  - plugins: disable package_state by default on el6
 +  - make /etc/mtab symlink to /proc/self/mounts [BZ# 1116158]
 +  - do not list pki files twice
 +  - deploy etc/pki to buildroot
 +- from Michael Simacek <msimacek at redhat.com>:
 +  - mock: do not allow config scripts to regain root priviledges
 +- from Igor Gnatenko <i.gnatenko.brain at gmail.com>:
 +  - Add F21 configs
 +  - Change releasever to 22 for rawhide
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.39-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Wed May 21 2014 Clark Williams <williams at redhat.com> - 1.1.39-1
  - configs: update epel-7 koji repo to use correct URL
  - from Ken Dreyer <ktdryer at ktdryder.com>