Merge lp:~jonas-drange/ubuntu-push/state-State into lp:ubuntu-push/automatic

Proposed by Jonas G. Drange
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 427
Merged at revision: 426
Proposed branch: lp:~jonas-drange/ubuntu-push/state-State
Merge into: lp:ubuntu-push/automatic
Diff against target: 25 lines (+2/-2)
2 files modified
bus/connectivity/connectivity_test.go (+1/-1)
bus/networkmanager/networkmanager.go (+1/-1)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-push/state-State
Reviewer Review Type Date Requested Status
Simon Fels Approve
Review via email:

Commit message

rename “state” to “State” to match the NM spec

Description of the change

To post a comment you must log in.
Revision history for this message
Simon Fels (morphis) wrote :


Revision history for this message
Simon Fels (morphis) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (34.9 MiB)

The attempt to merge lp:~jonas-drange/ubuntu-push/state-State into lp:ubuntu-push/automatic failed. Below is the output from the failed tests.

scripts/ server/dev/server.go
scripts/ server/acceptance/cmd/acceptanceclient.go
scripts/ ubuntu-push-client.go
/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin/godeps -t 2>/dev/null | cat > dependencies.tsv
rm -f -r /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/pkg
mkdir -p /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin
mkdir -p /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/pkg
go get -u
go get -d -u