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)
commitaacce08bcf16b5582996c5d5aafc32ac59479120
treeb7b5d18518846984431bd167d05cce799b16fb62
parent4f83e75083e39dd6f92694b2a322b422ca424c85
parentd8e2cf24a52af0470abd2f9f00892ddd4d206cff
Merge branch 'proxy'

* proxy:
  Add spec test for removing proxy configuration.
  Update manifests/init.pp
  Update manifests/init.pp
  Update manifests/init.pp