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

[John Clark Williams]

commit 4033eba592d5db94cd9ff296d1bdd8705b31612c
Merge: cd46534 9358a15
Author: Clark Williams <williams at redhat.com>
Date:   Thu Jun 21 13:41:07 2012 -0500

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

 fedora-17-ppc.cfg   |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 fedora-17-ppc64.cfg |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 mock.spec           |   12 +++++++++++-
 3 files changed, 109 insertions(+), 1 deletions(-)
---
diff --cc mock.spec
index ef9d045,a77b705..181267f
--- a/mock.spec
+++ b/mock.spec
@@@ -120,16 -125,12 +124,22 @@@ chmod 2775 /var/cache/moc
  %dir /var/lib/mock
   
  %changelog
 +* Thu Jun  7 2012 Clark Williams <williams at redhat.com> - 1.1.23-1
 +  - modified startup code to only set mock group [BZ# 809676]
 +  - add CLONE_NEWUTS to unshare(2) call [BZ# 818445]
 +  - from Seth Vidal <skvidal at fedoraproject.org>:
 +    - add mockchain to mock [BZ# 812477]
 +  - from Marko Myllynen <myllynen at redhat.com>:
 +    - fix write_tar check in scm.py [BZ# 828677]
 +  - from Masatake YAMATO <yamato at redhat.com>:
 +    - added option to set a plugin parameter value [BZ# 754321]
 +
+ * Tue May 08 2012 Karsten Hopp <karsten at redhat.com> 1.1.22-2.1
+ - add missing triple quotes to ppc config files
+ 
+ * Fri May 04 2012 Karsten Hopp <karsten at redhat.com> 1.1.22-2
+ - add Fedora 17 ppc and ppc64 configs
+ 
  * Thu Mar 29 2012 Clark Williams <williams at redhat.com> - 1.1.22-1
  - fix SCM problem with SSH_AUTH_SOCK [BZ# 803217]
  - From Chris St Pierre <chris.a.st.pierre at gmail.com>: