[openstack-sahara/f20: 29/29] Merge branch 'master' into f20

[Ethan Gafford]

commit 11ff6a6565d5224228403b197fed9b7a2d552f64
Merge: 4a02cc3 e07a7d4
Author: Ethan Gafford <egafford at redhat.com>
Date:   Mon Mar 9 14:44:08 2015 -0400

    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	0001-remove-runtime-dep-on-python-pbr.patch
    	openstack-sahara.spec
    	sources

 .gitignore                                         |   8 +
 0001-remove-runtime-dep-on-python-pbr.patch        |  15 +-
 ...d-migrations-and-hdp-versions-to-manifest.patch |  30 ----
 ...ference-actual-plugins-shipped-in-tarball.patch |  35 +++++
 0003-fix-stevedore-version-req.patch               |  20 ---
 0004-fix-plugin-base-for-stevedore.patch           |  11 --
 0005-fix-run-scripts.patch                         |  19 ---
 openstack-sahara-all.init                          | 103 ++++++++++++
 openstack-sahara-all.service                       |  11 ++
 openstack-sahara.spec                              | 173 +++++++++++++--------
 sources                                            |   2 +-
 11 files changed, 279 insertions(+), 148 deletions(-)
---