[mesos/f20: 20/21] Merge branch 'master' into f20

[tstclair]

commit 402b189c6c543f07b98ad616f9347ea7103c82c9
Merge: 4c6308b 5e2bd06
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Tue Aug 26 10:08:05 2014 -0500

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

 .gitignore                 |    3 +
 MESOS-1195.patch           |   57 +
 MESOS-831.patch            |  101 -
 build_mods.patch           | 2307 --
 fileshuffle_mods.patch     |62204 --------------------------------------------
 mesos-0.20-integ.patch     |  207 +
 mesos-master-env.sh        |    8 +
 mesos-master.service       |   27 +-
 mesos-non-x86-arches.patch |   42 +
 mesos-slave-env.sh         |   18 +
 mesos-slave.service        |   33 +-
 mesos.spec                 |  296 +-
 sources                    |    2 +-
 testing_mods.patch         |  277 -
 14 files changed, 579 insertions(+), 65003 deletions(-)
---