get rid of IsVirtual
Merge remote-tracking branch 'upstream/master' into 119-is-virtual
Promote DeployerTag to return a names.Tag
fix the duplicated tests in apiserver/client
wip
Merge remote-tracking branch 'upstream/master' into 104-juju-names-refactor-part-ii

Conflicts:
	state/megawatcher_internal_test.go
Merge branch 'master' of https://github.com/juju/juju into 104-juju-names-refactor-part-ii
Tweak hpcloud boilerplate to turn floating-ip and remove az from example region
wip
update dependencies.txt
Merge branch 'master' of https://github.com/juju/juju into 104-juju-names-refactor-part-ii

Conflicts:
	state/megawatcher_internal_test.go
Merge pull request #71 from davecheney/104-juju-names-refactor-part-ii

juju/names refactor part 2

Update juju/names to d656ac5
merge with upstream
rename test suite
Merge pull request #54 from klyachin/119-is-virtual

get rid of IsVirtual field

network: get rid of IsVirtual field

The field IsVirtual is redundant in NetworkInfo and network.Info structs,
the value may be inferred from the value of VLANTag field.
Merge pull request #85 from wallyworld/update-hpcloud-boilerplate

Tweak hpcloud boilerplate

This fixes bug https://bugs.launchpad.net/juju-core/+bug/1328905
HP Cloud now requires floating-ip = true and no az in the region so we update the boilerpate to tell people that.
Merge branch 'master' of https://github.com/juju/juju into 105-introduce-tags-type-iii

Conflicts:
	dependencies.tsv
agent/mongo: preallocate oplog data files

Preallocate oplog data files. If we don't
do this, then mongo is not happy with us
when running on big/slow disks. Probably
because we pass --nopreallocate to mongod.

Fixes https://bugs.launchpad.net/juju-core/+bug/1327940
Respond (sort of) to review feedback

Update dependencies.tsv
Merge pull request #82 from axw/lp1327940-prealloc-oplog

mongo: preallocate oplog data files

Preallocate oplog data files. If we don't do this, then mongo is not happy with us when running on big/slow disks. Probably because we pass --nopreallocate to mongod.

Fixes https://bugs.launchpad.net/juju-core/+bug/1327940