Code Review / puppet-modules / puppetlabs-apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | compact (merge: 4f83e75 d8e2cf2)
Merge branch 'proxy'
authorKen Barber <ken@bob.sh>
Sun, 2 Jun 2013 17:56:10 +0000 (18:56 +0100)
committerKen Barber <ken@bob.sh>
Sun, 2 Jun 2013 17:56:10 +0000 (18:56 +0100)
* proxy:
  Add spec test for removing proxy configuration.
  Update manifests/init.pp
  Update manifests/init.pp
  Update manifests/init.pp


Trivial merge