Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Tue, 19 Jun 2012 17:22:11 +0000 (17:22 +0000)
committerPeter Palfrader <peter@palfrader.org>
Tue, 19 Jun 2012 17:22:11 +0000 (17:22 +0000)
commit94a1ed63ad00ffb022307d4d91408e6cc3c0406a
treec7ca850f4f8cad95e9325e96d35545c64dc2c5a6
parent89d2ffe2f7e856f92d593cf14736bfdd8a797107
parent546ca0c41e746fb62605f7af3ccf11eaafe5fe0f
Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet

* 'master' of file:///srv/puppet.debian.org/git/dsa-puppet:
  Add more IP addresses to HOST_GANETI_* variables