add yosemite to macOSXSeries
Move backupsMetaC into backups.go.
Move state/backups.go to state/backups/storage.go.
Use the common implementation for getting a new State.
Add a note about dropping the corresponding function in state.
Use *state.State rather than the temp surrogate interfaces.
Fix a couple storage names.
Add yosemite
Fix a missed change.
Merge pull request #1182 from ericsnowcurrently/backups-storage-go

Move state/backups.go to the state/backups/storage.go.

This eliminates the state/backups dependency in state.  See https://bugs.launchpad.net/juju-core/+bug/1392520.

(Review request: http://reviews.vapour.ws/r/493/)
Merge pull request #966 from jrwren/master

add yosemite to macOSXSeries
state: env UUID migration for meterStatus collection

This is required for multi-environment support.
Merge pull request #1189 from mjs/meterstatus-env-uuid

state: env UUID migration for meterStatus collection

This is required for multi-environment support.

(Review request: http://reviews.vapour.ws/r/499/)
worker/diskformatter: new worker to create filesystems

The diskformatter worker watches for block devices
assigned to datastores owned by the unit whose agent
is running the worker. Those block devices without
a filesystem will have a filesystem created, and then
recorded in state.
worker/diskmanager: fix test name
storage: add tests for BlockDevicePath

Also, remove state/datastore.go
worker/diskformatter: moved package doc
Merge pull request #1191 from axw/worker-diskformatter

worker/diskformatter: new worker to create filesystems

The diskformatter worker watches for block devices assigned to datastores
owned by the unit whose agent is running the worker. Those block devices
without a filesystem will have a filesystem created according to the
datastore's filesystem preferences (specified in the charm metadata), and
then recorded in state.

(Review request: http://reviews.vapour.ws/r/501/)
Merge branch 'master' into releaseaddress-ec2