Updated docs

hashicorp · Jun 21, 2016 · c655ba1 · c655ba1
1 parent 0b608e2
commit c655ba1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ __BACKWARDS INCOMPATIBILITIES:__
     eval-status -monitor`.
   * config: Consul configuration has been moved from client options map to
     consul block under client configuration
+  * driver/docker: Enabled SSL by default for pulling images from docker
+    registries. [GH-1336]
 
 IMPROVEMENTS:
   * core: Scheduler reuses blocked evaluations to avoid unbounded creation of
@@ -34,6 +36,8 @@ IMPROVEMENTS:
     if the artifact exists inside a chrooted directory [GH-1262]
   * driver/docker: Added a client options to set SELinux labels for container
     bind mounts. [GH-788]
+  * driver/docker: Enabled SSL by default for pulling images from docker
+    registries. [GH-1336]
   * server: If Consul is available, automatically bootstrap Nomad Servers
     using the `_nomad` service in Consul.  [GH-1276]
 

diff --git a/website/source/docs/drivers/docker.html.md b/website/source/docs/drivers/docker.html.md
@@ -94,7 +94,7 @@ The following options are available for use in the job specification.
   to use.
 
 * `SSL` - (Optional) If this is set to true, Nomad uses SSL to talk to the
-  repository. The default value is `false`.
+  repository. The default value is `true`.
 
 * `port_map` - (Optional) A key/value map of port labels (see below).