[deltacloud-core: 2/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/deltacloud-core

[Michal Fojtik]

commit 108969d84763445115424d1a52f0272c9065ef37
Merge: bd80ec1 c101b72
Author: Michal Fojtik <mi at mifo.sk>
Date:   Fri Nov 11 17:36:51 2011 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/deltacloud-core

 .gitignore                                         |    8 --
 ...UIDTools-instead-of-UUID-in-condor-driver.patch |   38 ++++++++
 deltacloud-core-config                             |   28 ++++++
 deltacloud-core.init                               |   97 ++++++++++++++++++++
 deltacloudd-fedora                                 |    5 +
 5 files changed, 168 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index f41c0dc,0342d4d..a37cd46
--- a/.gitignore
+++ b/.gitignore
@@@ -1,15 -1,2 +1,7 @@@
--/deltacloud-core-0.3.0.gem
- /fix_load_balancers.patch
- /deltacloudd-fedora
- /fix_rhevm_memory_calculation.patch
- /deltacloud-core-config
- /rhevm-long-username.patch
- /rhevm-long-username-fix.patch
--/deltacloud-core-0.4.0.gem
 +/deltacloud-core.init
 +/0001-Backported-r1181859-patches.patch
 +/0001-Vsphere-Removed-unnecessary-validation-in-create_ins.patch
 +/0002-Google-storage-driver.patch
 +/0003-Openstack-driver.patch
 +/0004-Fixed-validation-error.patch
 +/0005-Fixes-for-launcher.patch