state: revert field name change

state.address.NetworkScope was renamed to
Scope, with no explicit bson field name
specified. This is a schema change, and
broke upgrade from 1.18 to 1.19.

Fixes https://bugs.launchpad.net/juju-core/+bug/1334773
Merge branch 'master' of github.com:davecheney/juju
Merge pull request #183 from axw/lp1334773-state-address-networkscope

state: revert field name change

state.address.NetworkScope was renamed to
Scope, with no explicit bson field name
specified. This is a schema change, and
broke upgrade from 1.18 to 1.19.

Fixes https://bugs.launchpad.net/juju-core/+bug/1334773
Fix conditional build
remove werker dreg
More robust HA upgrade in machine agent

If upgrading mongo to HA only partially
completes such that the replicaset is not
initiated, then we would previously failed
on the second attempt. Make sure we use
"Direct" connections when upgrading to HA.

Possibly fixes https://launchpad.net/bugs/1334273
Merge pull request #186 from davecheney/fix-os-version

Fix os version

Fix Lp 1334493

Remove all the double underpants // +build tags, the os is inferred from the name of the file.

Remove osversion_unknown.go, Juju cannot operate without knowing the series of the machine, so cause a compilation failure, rather than produce tools that explode on use.

lucky(~/src/github.com/juju/juju/version) % GOOS=windows go list -f '{{.GoFiles}}'                                                   
[osversion.go osversion_windows.go supportedseries.go version.go]
lucky(~/src/github.com/juju/juju/version) % GOOS=linux go list -f '{{.GoFiles}}'                                                     
[osversion.go osversion_linux.go supportedseries.go version.go]
lucky(~/src/github.com/juju/juju/version) % GOOS=darwin go list -f '{{.GoFiles}}'                                                    
[osversion.go osversion_darwin.go supportedseries.go version.go]
Merge pull request #187 from axw/machine-agent-upgrade-ha-robustness

More robust HA upgrade in machine agent

If upgrading mongo to HA only partially
completes such that the replicaset is not
initiated, then we would previously failed
on the second attempt. Make sure we use
"Direct" connections when upgrading to HA.

Possibly fixes https://launchpad.net/bugs/1334273
Merge remote-tracking branch 'upstream/master' into 121-networkinterfaceswatcher