wip
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
Merge branch 'master' of https://github.com/juju/juju into 105-introduce-tags-type-iii
Merge pull request #88 from davecheney/105-introduce-tags-type-iii

juju/names refactor part 3

Updates for changes to juju/names package

dependencies.tsv change is not included, need the juju/names PR to land to get the correct commit hash
Add  Server API method: UserInfo

Add a method to the UserManagerAPI which takes
a username and returns a struct of user
information.