diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2009-12-27 17:48:08 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2009-12-27 17:48:08 -0200 |
| commit | fb09f12c8a838372b64304fb40f047671e020d27 (patch) | |
| tree | fa3aa86c22a22347492c15abd1d3302ee322b3dc /files/xen/config/xend-config.sxp | |
| parent | 615a9e08f69335d46695db4748725fcc5b4393b8 (diff) | |
| parent | 2163466a745fee4bb92d3e628343c2808dcf4bc3 (diff) | |
| download | puppet-virtual-fb09f12c8a838372b64304fb40f047671e020d27.tar.gz puppet-virtual-fb09f12c8a838372b64304fb40f047671e020d27.tar.bz2 | |
Merge branch 'master' of git://labs.riseup.net/module_virtual
Conflicts:
manifests/vserver.pp
Diffstat (limited to 'files/xen/config/xend-config.sxp')
0 files changed, 0 insertions, 0 deletions