wercker config file
Fix magic
wrong alias
wrong alias
9th time's the charm
Merge branch 'master' of https://github.com/juju/juju
Add conditional compilation directives to fix build on windows
Merge pull request #165 from wallyworld/windows-compile-error

Add conditional compilation directives to fix build on windows

Fix a compile error on windows.
Fix data race on Server.environUUID
remove wercker file
Fix data race on Server.environUUID
Merge branch '116-fix-apiserver-data-race' of github.com:davecheney/juju into 116-fix-apiserver-data-race
Merge pull request #166 from davecheney/116-fix-apiserver-data-race

116 fix apiserver data race

Fixes LP 1334500
Add new managed resources implementation
Code review fixes
Fix defer errors
Merge pull request #124 from wallyworld/managed-resources

Add new managed resources implementation

A new ManagedStorage interface allows blobs to be stored in a mongo database. The blobs are initially namespaced to an environment but apis will be added to the interface to allow data to be stored globally or against a given user.

Data is de-duped when Put - if there is already a blob with the same checksums (md5/sha256) it is not stored twice; a reference to the original data is used.
state/{api,apiserver}: don't leak heartbeat goroutine

- In api.State.Close, signal and wait for the heartbeat
  goroutine to stop before returning.
- Add various missing api.State.Close calls to apiserver
  tests.

Fixes https://bugs.launchpad.net/juju-core/+bug/1334531
Merge pull request #167 from axw/lp1334531-dont-leak-apistate

state/{api,apiserver}: don't leak heartbeat goroutine

- In api.State.Close, signal and wait for the heartbeat
  goroutine to stop before returning.
- Add various missing api.State.Close calls to apiserver
  tests.

Fixes https://bugs.launchpad.net/juju-core/+bug/1334531
update dependencies.tsv to use new names version