253f835667
Merge branch 'f-permissions' of github.com:hashicorp/nomad into f-permissions
2017-02-02 11:28:24 -08:00
1a960ee5cd
Grammar fix
2017-02-02 11:28:04 -08:00
d0021c2153
Merge pull request #2270 from hashicorp/f-vault-sighup
...
Vault Client on Server handles SIGHUP
2017-02-02 11:27:15 -08:00
8daa713887
Changelog
2017-02-02 11:26:48 -08:00
e8321876d9
Merge pull request #2271 from hashicorp/f-prep-0.5.5
...
Prep for 0.5.5 and add changelog entry for #2266
2017-02-02 11:24:27 -08:00
bc6c9a7d54
Merge pull request #2275 from hashicorp/b-vault-race
...
Fix race condition with Deriving vault tokens
2017-02-02 11:19:46 -08:00
7fae2d2cea
Fix Consul Config Merging/Copying
...
This PR fixes config merging/copying code.
Fixes https://github.com/hashicorp/nomad/issues/2264
2017-02-02 11:12:07 -08:00
52a22bcded
Update `github.com/go-ole/go-ole` and remove a bit of cruft.
2017-02-01 22:51:03 -08:00
194355db35
Update `github.com/StackExchange/wmi`
2017-02-01 22:43:15 -08:00
66f21047ba
Update github.com/shirou/gopsutil and friends.
2017-02-01 22:41:29 -08:00
767c0667f5
Update `github.com/shirou/w32`
2017-02-01 22:25:39 -08:00
bb4347e277
Slight mis-merge: secret-id in dev mode is random and needs to be returned.
2017-02-01 22:20:52 -08:00
bb422a2258
Generate a durable NodeID if possible, otherwise fall back to a random HostID.
2017-02-01 22:11:33 -08:00
3b3ff6a0da
Update github.com/shirou/gopsutil/host to include HostID update
2017-02-01 22:00:00 -08:00
8d3fdc8ca5
Remove github.com/shiro/gopsutil (leave its child packages, however)
2017-02-01 21:58:19 -08:00
92b5e74da9
Merge branch 'master' into f-vendor-serf-memberlist
2017-02-01 16:57:49 -08:00
b40f284bd1
Merge branch 'master' into f-permissions
2017-02-01 16:57:46 -08:00
f2169cb111
Merge branch 'master' into f-vault-sighup
2017-02-01 16:57:43 -08:00
ec7bc783a4
Merge branch 'master' into b-vault-race
2017-02-01 16:57:26 -08:00
73813fba31
Merge pull request #2269 from hashicorp/gc-test
...
Checking in updated gc tests
2017-02-01 16:50:35 -08:00
cd34f536a3
Merge branch 'master' of github.com:hashicorp/nomad
2017-02-01 16:37:14 -08:00
9c75ec7f57
Add role to merge test
2017-02-01 16:37:08 -08:00
9987a235a5
Fix race condition with Deriving vault tokens
...
This PR fixes a race condition in which the client was not locked while
deriving Vault tokens. This allowed the token to be set which would
cause subsequent Vault requests to fail with permission denied because
the incorrect Vault token was being used.
Further this PR makes the unsetting and unlocking of the client atomic
to avoid an even harder to hit race condition (not sure it was ever hit
but was still incorrect).
2017-02-01 16:25:59 -08:00
67dc113158
Merge pull request #2274 from hashicorp/doc-rkt-port-map
...
Expand rkt port_map docs since it confused me
2017-02-01 16:19:17 -08:00
bc02869347
Expand rkt port_map docs since it confused me
...
(and I wrote it)
Fixes #2272
2017-02-01 16:16:12 -08:00
e03bae9d25
spel dev correktly
2017-02-01 15:29:02 -08:00
ee53595012
Prep for 0.5.5 and add changelog entry for #2266
2017-02-01 15:09:49 -08:00
a26482a57a
Merge pull request #2267 from BSick7/b/panic-startup
...
Preventing panics of RecoverableError casts
2017-02-01 15:06:57 -08:00
15ffdff497
Vault Client on Server handles SIGHUP
...
This PR allows the Vault client on the server to handle a SIGHUP. This
allows updating the Vault token and any other configuration without
downtime.
2017-02-01 14:24:10 -08:00
c67f10166d
fmt
2017-02-01 16:37:19 -05:00
da12d8811a
Third time is a charm.
2017-02-01 16:18:12 -05:00
90ac3e2774
Checking in updated gc tests
2017-02-01 13:12:46 -08:00
5a8f2d3f60
Properly dealing with non-nil errors.
2017-02-01 16:07:19 -05:00
429fdb3ce7
Preventing panics of RecoverableError casts
2017-02-01 14:38:59 -05:00
d470fe494d
Merge pull request #2260 from hashicorp/f-circonus-update
...
Update circonus vendor
2017-02-01 11:20:46 -08:00
c6ef012345
Merge pull request #2265 from hashicorp/wat
...
Bump to 0.5.4
2017-02-01 10:52:47 -08:00
6b7efa1ba6
Template destination file permissions.
...
This PR allows setting the file permissions of the rendered template.
2017-01-31 20:10:01 -08:00
4cd173c1bb
Bump website + demo to 0.5.4
2017-01-31 17:36:36 -08:00
803b74c863
Release v0.5.4
2017-01-31 17:08:20 -08:00
7346d9b309
Release v0.5.4
2017-01-31 17:07:56 -08:00
1281f2586b
Prep versoin 0.5.4
2017-01-31 16:48:37 -08:00
c64b67661c
Updated changelog
2017-01-31 16:46:16 -08:00
d463bb8e5a
Merge pull request #2261 from hashicorp/f-gc-threshold
...
Making GC related fields tunable
2017-01-31 16:44:53 -08:00
501f675265
Added docs
2017-01-31 16:30:50 -08:00
11d7cb1230
Making the GC related fields tunable
2017-01-31 15:51:20 -08:00
e9e7d7eb9b
Mention #2256 in 0.5.4 changelog
2017-01-31 15:16:46 -08:00
b4ca619d14
Update circonus vendor
2017-01-31 15:11:55 -08:00
1eb0c277bf
Revert "Merge pull request #2258 from hashicorp/f-update-circonus-vendor"
...
This reverts commit b7417003eb6a6d9197e5e0e3a1d04b70e88b3311, reversing
changes made to b51a11c8edd0c91149bea26cc53408e58af19514.
2017-01-31 15:04:38 -08:00
0cc6d2abc9
Merge pull request #2258 from hashicorp/f-update-circonus-vendor
...
Update circonus vendor
2017-01-31 14:01:48 -08:00
6ea705e065
Merge pull request #2259 from hashicorp/b-fix-vagrant
...
Fix vagrant on vbox
2017-01-31 13:52:34 -08:00
Alex Dadgar