[mesos/f21: 4/4] Merge branch 'f20' into f21

[tstclair]

commit 64f1937fd72449ddde3964316b2c9e529a2bca76
Merge: 7f1f980 402b189
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Tue Aug 26 10:19:21 2014 -0500

    Merge branch 'f20' into f21
    
    Conflicts:
    	mesos.spec

 .gitignore             |    1 +
 libev_mod.patch        |   11 +
 mesos-0.18-integ.patch |74387 ------------------------------------------------
 mesos-0.20-integ.patch |  207 +
 mesos-slave-env.sh     |    6 +-
 mesos.spec             |   81 +-
 sources                |    2 +-
 7 files changed, 266 insertions(+), 74429 deletions(-)
---
diff --cc mesos.spec
index c952006,f2a4c69..4ac70d6
--- a/mesos.spec
+++ b/mesos.spec
@@@ -260,9 -262,9 +262,12 @@@ exit 
  /sbin/ldconfig
  
  %changelog
+ * Wed Aug 20 2014 Timothy St. Clair <tstclair at redhat.com> - 0.20.0-1.f421ffd
+ - Rebase to new release 0.20
+ 
 +* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18.2-6.453b973
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 +
  * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18.2-5.453b973
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild