diff --git a/README.md b/README.md index 9ab6888d3..b74ba9e27 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ -Nomad [![Build Status](https://travis-ci.org/hashicorp/nomad.svg)](https://travis-ci.org/hashicorp/nomad) +Nomad [![Build Status](https://travis-ci.org/hashicorp/nomad.svg)](https://travis-ci.org/hashicorp/nomad) [![Join the chat at https://gitter.im/hashicorp-nomad/Lobby](https://badges.gitter.im/hashicorp-nomad/Lobby.svg)](https://gitter.im/hashicorp-nomad/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ========= - - Website: https://www.nomadproject.io - IRC: `#nomad-tool` on Freenode - Mailing list: [Google Groups](https://groups.google.com/group/nomad-tool) diff --git a/demo/vagrant/Vagrantfile b/demo/vagrant/Vagrantfile index afb075bf9..1fa803fbf 100644 --- a/demo/vagrant/Vagrantfile +++ b/demo/vagrant/Vagrantfile @@ -9,7 +9,7 @@ sudo apt-get install -y unzip curl wget vim # Download Nomad echo Fetching Nomad... cd /tmp/ -curl -sSL https://releases.hashicorp.com/nomad/0.4.0/nomad_0.4.0_linux_amd64.zip -o nomad.zip +curl -sSL https://releases.hashicorp.com/nomad/0.4.1/nomad_0.4.1_linux_amd64.zip -o nomad.zip echo Installing Nomad... unzip nomad.zip diff --git a/nomad/structs/config/vault.go b/nomad/structs/config/vault.go index c93de23d4..d97909f18 100644 --- a/nomad/structs/config/vault.go +++ b/nomad/structs/config/vault.go @@ -73,7 +73,6 @@ type VaultConfig struct { // `vault` configuration. func DefaultVaultConfig() *VaultConfig { return &VaultConfig{ - Enabled: true, AllowUnauthenticated: false, Addr: "https://vault.service.consul:8200", ConnectionRetryIntv: DefaultVaultConnectRetryIntv,