Merge https://github.com/capone212/nomad

2016-05-09 13:36:12 +03:00 · 2016-05-09 13:36:12 +03:00 · f8a2334270
parent 875df91e0b 5728ca5507
commit f8a2334270
2 changed files with 2 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -7,7 +7,7 @@ services:
 language: go

 go:
-  - 1.6.1
+  - 1.6.2

 matrix:
  allow_failures:
--- a/website/source/docs/agent/config.html.md
+++ b/website/source/docs/agent/config.html.md
@ -19,7 +19,7 @@ the Nomad agent.
 When specifying multiple config file options on the command-line, the files are
 loaded in the order they are specified. For example:

-    nomad agent -config server.conf /etc/nomad extra.json
+    nomad agent -config server.conf -config /etc/nomad -config extra.json

 Will load configuration from `server.conf`, from `.hcl` and `.json` files under
 `/etc/nomad`, and finally from `extra.json`.