juju-core

Merge lp://qastaging/~frankban/juju-core/utils-proxy into lp://qastaging/~go-bot/juju-core/trunk

utils-proxy
Merge into trunk

Proposed by Francesco Banconi on 2014-05-26

Status:	Merged
Approved by:	Francesco Banconi on 2014-05-26
Approved revision:	no longer in the source branch.
Merged at revision:	2795
Proposed branch:	lp://qastaging/~frankban/juju-core/utils-proxy
Merge into:	lp://qastaging/~go-bot/juju-core/trunk
Diff against target:	1234 lines (+178/-160) 24 files modified cmd/jujud/machine_test.go (+2/-2) container/lxc/clonetemplate.go (+3/-3) container/lxc/lxc_test.go (+2/-2) environs/cloudinit.go (+4/-4) environs/cloudinit/cloudinit.go (+7/-7) environs/config/config.go (+14/-13) environs/config/config_test.go (+10/-9) provider/local/environ.go (+3/-2) provider/local/environprovider.go (+11/-10) provider/local/environprovider_test.go (+20/-20) state/api/params/params.go (+3/-3) state/apiserver/provisioner/provisioner_test.go (+2/-2) utils/apt/apt.go (+8/-8) utils/apt/apt_test.go (+13/-13) utils/proxy/package_test.go (+14/-0) utils/proxy/proxy.go (+14/-14) utils/proxy/proxy_test.go (+22/-22) worker/machineenvironmentworker/machineenvironmentworker.go (+5/-5) worker/machineenvironmentworker/machineenvironmentworker_test.go (+6/-6) worker/uniter/context.go (+3/-3) worker/uniter/context_test.go (+5/-5) worker/uniter/export_test.go (+2/-2) worker/uniter/uniter.go (+2/-2) worker/uniter/uniter_test.go (+3/-3)
To merge this branch:	bzr merge lp://qastaging/~frankban/juju-core/utils-proxy
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Juju Engineering		2014-05-26	Pending
Review via email: mp+220942@code.qastaging.launchpad.net

Commit message

New utils/proxy package.

Description of the change

New utils/proxy package.

Move osenv.Proxy* to utils/proxy.
Remove the osenv dependency from utils/apt.

https://codereview.appspot.com/92610045/

Revision history for this message

Francesco Banconi (frankban) wrote on 2014-05-26:

Reviewers: mp+220942_code.launchpad.net,

Message:
Please take a look.

Description:
New utils/proxy package.

Move osenv.Proxy* to utils/proxy.
Remove the osenv dependency from utils/apt.

https://code.launchpad.net/~frankban/juju-core/utils-proxy/+merge/220942

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/92610045/

Affected files (+171, -160 lines):
   A [revision details]
   M cmd/jujud/machine_test.go
   M container/lxc/clonetemplate.go
   M container/lxc/lxc_test.go
   M environs/cloudinit.go
   M environs/cloudinit/cloudinit.go
   M environs/config/config.go
   M environs/config/config_test.go
   M provider/local/environ.go
   M provider/local/environprovider.go
   M provider/local/environprovider_test.go
   M state/api/params/params.go
   M state/apiserver/provisioner/provisioner_test.go
   M utils/apt/apt.go
   M utils/apt/apt_test.go
   M utils/proxy/proxy.go
   M utils/proxy/proxy_test.go
   M worker/machineenvironmentworker/machineenvironmentworker.go
   M worker/machineenvironmentworker/machineenvironmentworker_test.go
   M worker/uniter/context.go
   M worker/uniter/context_test.go
   M worker/uniter/export_test.go
   M worker/uniter/uniter.go
   M worker/uniter/uniter_test.go

Revision history for this message

William Reade (fwereade) wrote on 2014-05-26:

LGTM

https://codereview.appspot.com/92610045/diff/1/utils/proxy/proxy_test.go
File utils/proxy/proxy_test.go (right):

https://codereview.appspot.com/92610045/diff/1/utils/proxy/proxy_test.go#newcode17
utils/proxy/proxy_test.go:17: gc.TestingT(t)
please put this in a package_test.go, it's way too easy to double/miss
them otherwise.

https://codereview.appspot.com/92610045/

Revision history for this message

Francesco Banconi (frankban) wrote on 2014-05-26:

Please take a look.

https://codereview.appspot.com/92610045/diff/1/utils/proxy/proxy_test.go
File utils/proxy/proxy_test.go (right):

https://codereview.appspot.com/92610045/diff/1/utils/proxy/proxy_test.go#newcode17
utils/proxy/proxy_test.go:17: gc.TestingT(t)
On 2014/05/26 12:27:29, fwereade wrote:
> please put this in a package_test.go, it's way too easy to double/miss
them
> otherwise.