From f84f29c924b5ac98600c360b07968df24d9d555d Mon Sep 17 00:00:00 2001
From: OlgaGusarenko <ogusarenko@mirantis.com>
Date: Fri, 27 Feb 2015 13:39:35 +0200
Subject: [PATCH] Heat Docker Resource enabled by default

Adds info regarding the "Heat Docker Resource
 enabled by default" feature to the Release Notes 6.1.

Change-Id: Iecb99e61b33d0813c4c205b2f3210a3e121e1358
---
 pages/release-notes/v6-1/0020-new-features.rst     |  1 +
 .../v6-1/new-features/heat-docker-resource.rst     | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pages/release-notes/v6-1/new-features/heat-docker-resource.rst

diff --git a/pages/release-notes/v6-1/0020-new-features.rst b/pages/release-notes/v6-1/0020-new-features.rst
index c0cee4fd4..274c972dc 100644
--- a/pages/release-notes/v6-1/0020-new-features.rst
+++ b/pages/release-notes/v6-1/0020-new-features.rst
@@ -52,6 +52,7 @@ and `Upgrade and OpenStack environment to a new major release
 .. include:: /pages/release-notes/v6-1/new-features/ubuntu-downloadable.rst
 .. include:: /pages/release-notes/v6-1/new-features/ha-improve.rst
 .. include:: /pages/release-notes/v6-1/new-features/200-nodes.rst
+.. include:: /pages/release-notes/v6-1/new-features/heat-docker-resource.rst
 .. include:: /pages/release-notes/v6-1/new-features/granular-deploy.rst
 .. include:: /pages/release-notes/v6-1/new-features/base-os-role.rst
 .. include:: /pages/release-notes/v6-1/new-features/mos-separate-from-fuel.rst
diff --git a/pages/release-notes/v6-1/new-features/heat-docker-resource.rst b/pages/release-notes/v6-1/new-features/heat-docker-resource.rst
new file mode 100644
index 000000000..4dd547e79
--- /dev/null
+++ b/pages/release-notes/v6-1/new-features/heat-docker-resource.rst
@@ -0,0 +1,14 @@
+
+Heat Docker Resource enabled by default
+---------------------------------------
+
+Mirantis OpenStack 6.1 enables Docker Resource for
+Heat by default. Now it can be used by Murano without additional
+deployment workarounds. Installed
+at the deployment step, Docker Resource is available for
+Heat on its first launch. Use the **heat resource-list**
+command to view the list of available resources.
+
+For more details, see the `Enable Heat Docker resource by default
+<https://blueprints.launchpad.net/mos/+spec/heat-docker-resource-by-default>`_
+blueprint.