Update git submodules
* Update puppet-swift from branch 'master' to 1a1264b435d7dd42850a1ea358e6872af886be2c - Merge "Revert "Avoid duplicate package swift."" - Revert "Avoid duplicate package swift." This reverts commit 31aa020b0fbfe98772c4271d58ee9e4a62a2166e. The original change mentioned puppet-glance can install the same package but it is not correct (at least currently) and puppet-glance installs not the core package but the client package. Conflicts: manifests/init.pp Change-Id: I53f29aa6435b757b72ce785e4d7f29dcdcf03d33
This commit is contained in:
parent
d715da82d0
commit
14d3795b3e
|
@ -1 +1 @@
|
|||
Subproject commit 12ce6b7631fa4b73f3ad530c5131f14a3d81d504
|
||||
Subproject commit 1a1264b435d7dd42850a1ea358e6872af886be2c
|
Loading…
Reference in New Issue