Change target for dockerng assuming default status to Nitrogen release (

#34206) The work I need to do in the loader to achieve this is not likely to be done in time for the Carbon release.
saltstack · Jun 22, 2016 · 5bca5c4 · 5bca5c4
1 parent 1c4369d
commit 5bca5c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/salt/modules/dockerng.py b/salt/modules/dockerng.py
@@ -19,7 +19,7 @@
 SLS files, etc. to use the new functionality, rather than forcing users to
 change everything immediately.
 
-In the **Carbon** release of Salt (due in 2016), this execution module will
+In the **Nitrogen** release of Salt (due in 2017), this execution module will
 take the place of the default Docker execution module, and backwards-compatible
 naming will be maintained for a couple releases after that to allow users time
 to replace references to ``dockerng`` with ``docker``.

diff --git a/salt/states/dockerng.py b/salt/states/dockerng.py
@@ -23,7 +23,7 @@
 SLS files, etc. to use the new functionality, rather than forcing users to
 change everything immediately.
 
-In the **Carbon** release of Salt (due in 2016), this execution module will
+In the **Nitrogen** release of Salt (due in 2017), this execution module will
 take the place of the default Docker execution module, and backwards-compatible
 naming will be maintained for a couple releases after that to allow users time
 to replace references to ``dockerng`` with ``docker``.