diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-12-22 11:05:41 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-12-22 11:05:41 -0200 |
| commit | eb33a9ec1f8e39d439f8b9ab93324daa6cb8b166 (patch) | |
| tree | 519073c17211c49855915b459fc0d5268baca426 /manifests/subsystems/initramfs.pp | |
| parent | 869a40afda09c344d8e652c5f08d06e407e3ceae (diff) | |
| parent | 4c5b595cf0e0ebcff1c49b916bbce3b4979cc82f (diff) | |
| download | puppet-nodo-eb33a9ec1f8e39d439f8b9ab93324daa6cb8b166.tar.gz puppet-nodo-eb33a9ec1f8e39d439f8b9ab93324daa6cb8b166.tar.bz2 | |
Merge branch 'master' of ssh://git.fluxo.info:2208/puppet-nodo
Conflicts:
manifests/subsystems/utils/debian.pp
Diffstat (limited to 'manifests/subsystems/initramfs.pp')
0 files changed, 0 insertions, 0 deletions