diff options
| author |   Stanislaw Kardach <kda@semihalf.com> | 2016-03-29 14:42:46 +0200 |
|---|---|---|
| committer | Stanislaw Kardach <kda@semihalf.com> | 2016-03-29 15:07:29 +0200 |
| commit | ccf57699bbff183ef45fd4a4e94df094ca69ee87 (patch) | |
| tree | d9944c56ff1126f3bdbb6afaaba8f862c6b5352b /patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch | |
| parent | f101dd4429858b1b313eec81959576d974b34f23 (diff) | |
Rebase patches and fix importing
* We were missing the patch rebase changes that were introduced by gerrit
automatic upstream project update for submodules. This patch introduces
them.
* Apply all submodule patches a single `git am` call to help with
rebasing patches.
* Correct Opendaylight plugin initialization in repo config.
Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
Diffstat (limited to 'patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch')
| -rw-r--r-- | patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch b/patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch index 0c110430..065ea408 100644 --- a/patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch +++ b/patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch @@ -116,7 +116,7 @@ index 04d597c..c342830 100755 exit 1 unless errors == 0 diff --git a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb b/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb -index 88b2c73..65e9400 100644 +index 2d030d9..b33fb25 100644 --- a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb +++ b/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb @@ -3,9 +3,15 @@ |