From 272cb58899b7299e6b4bc3603abc94925dbf507a Mon Sep 17 00:00:00 2001
From: Daniel Wallace <danielwallace@gtmanfred.com>
Date: Fri, 18 May 2018 09:14:47 -0500
Subject: [PATCH] add to release notes

---
 .testing.pylintrc                |  1 +
 doc/topics/releases/fluorine.rst | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/.testing.pylintrc b/.testing.pylintrc
index ccb20da64d4..30f93d53bb5 100644
--- a/.testing.pylintrc
+++ b/.testing.pylintrc
@@ -267,6 +267,7 @@ additional-builtins=__opts__,
   __proxy__,
   __serializers__,
   __reg__,
+  __executors__,
   __events__
 
 
diff --git a/doc/topics/releases/fluorine.rst b/doc/topics/releases/fluorine.rst
index c3937c1c3a8..f5b200b6a51 100644
--- a/doc/topics/releases/fluorine.rst
+++ b/doc/topics/releases/fluorine.rst
@@ -4,6 +4,24 @@
 Salt Release Notes - Codename Fluorine
 ======================================
 
+New Docker Proxy Minion
+-----------------------
+
+Docker containers can now be treated as actual minions without installing salt
+in the container, using the new :py:mod:`docker proxy minion <salt.proxy.docker>`.
+
+This proxy minion uses the :py:mod:`docker executor <salt.executors.docker>` to
+pass commands to the docker container using :py:func:`docker.call
+<salt.modules.dockermod.call>`.  Any state module calls are passed through the
+corresponding function from the :py:mod:`docker <salt.modules.dockermod>`
+module.
+
+.. code-block:: yaml
+
+    proxy:
+      proxytype: docker
+      name: keen_proskuriakova
+
 
 Grains Dictionary Passed into Custom Grains
 -------------------------------------------