From 4afcdbdb3c580281577dc13c0a0b5a52c1ef6f41 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Fri, 11 Jul 2014 11:11:54 -0700
Subject: [PATCH 1/2] Add docs for volumes_from

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 docs/yml.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/yml.md b/docs/yml.md
index 6204122fb..a299669cc 100644
--- a/docs/yml.md
+++ b/docs/yml.md
@@ -54,6 +54,11 @@ expose:
 volumes:
  - cache/:/tmp/cache
 
+-- Mount all of the volumes from another service or container
+volumes_from:
+ - service_name
+ - container_name
+
 -- Add environment variables.
 -- Environment variables with only a key are resolved to values on the host 
 -- machine, which can be helpful for secret or host-specific values.

From 54894659058bf796bd58ea6f89b8361b656f0887 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Fri, 11 Jul 2014 11:17:25 -0700
Subject: [PATCH 2/2] Ship 0.5.0

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 CHANGES.md      | 30 ++++++++++++++++++++++++++++++
 fig/__init__.py |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 520f62ccc..1ed060d6e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,36 @@
 Change log
 ==========
 
+0.5.0 (2014-07-11)
+------------------
+
+ - Fig now starts links when you run `fig run` or `fig up`.
+   
+   For example, if you have a `web` service which depends on a `db` service, `fig run web ...` will start the `db` service.
+
+ - Environment variables can now be resolved from the environment that Fig is running in. Just specify it as a blank variable in your `fig.yml` and, if set, it'll be resolved:
+   ```
+   environment:
+     RACK_ENV: development
+     SESSION_SECRET:
+   ```
+
+ - `volumes_from` is now supported in `fig.yml`. All of the volumes from the specified services and containers will be mounted:
+
+   ```
+   volumes_from:
+    - service_name
+    - container_name
+   ```
+
+ - The `net` and `workdir` options are now supported in `fig.yml`.
+ - The `hostname` option now works in the same way as the Docker CLI, splitting out into a `domainname` option.
+ - TTY behaviour is far more robust, and resizes are supported correctly.
+ - Load YAML files safely.
+
+Thanks to @d11wtq, @ryanbrainard, @rail44, @j0hnsmith, @binarin, @Elemecca and @mozz100 for their help with this release!
+
+
 0.4.2 (2014-06-18)
 ------------------
 
diff --git a/fig/__init__.py b/fig/__init__.py
index 18871f430..db027d365 100644
--- a/fig/__init__.py
+++ b/fig/__init__.py
@@ -1,4 +1,4 @@
 from __future__ import unicode_literals
 from .service import Service
 
-__version__ = '0.4.2'
+__version__ = '0.5.0'