Alex Dadgar
5b75b29af4
Nomad builds
2017-02-07 20:31:23 -08:00
Alex Dadgar
ff2d929e2b
Fix test
2017-02-07 11:35:38 -08:00
Alex Dadgar
a29f6e82da
Fix state store tests
2017-02-06 16:46:23 -08:00
Alex Dadgar
4cbc72678e
Use watchset on getter methods
2017-02-05 12:45:57 -08:00
Alex Dadgar
7128558aeb
Update state store and blocking query helper
2017-02-05 12:03:11 -08:00
Alex Dadgar
62bf777a13
Vendor
2017-02-03 16:28:27 -08:00
Alex Dadgar
b6212bc688
reloads
2017-02-03 16:12:21 -08:00
Alex Dadgar
5768252f2f
Changelog
2017-02-03 14:28:29 -08:00
Alex Dadgar
6b99276f30
Merge pull request #2281 from dbresson/fix-reserved-merge-error
...
avoid a nil pointer dereference
2017-02-03 14:27:07 -08:00
David Bresson
a49759f1b8
avoid nil pointer dereference
2017-02-03 08:39:57 -08:00
David Bresson
1a6c67d106
extend config merge test to test merging to empty config
2017-02-03 08:35:18 -08:00
Alex Dadgar
52a4c9276a
Merge pull request #2279 from hashicorp/f-windows-hostid
...
Add durable HostID generation support to Windows.
2017-02-02 17:03:55 -08:00
Sean Chittenden
31333eecae
Add better verification of a host's HostID.
2017-02-02 16:24:32 -08:00
Sean Chittenden
b24c8354e6
Add durable HostID generation support to Windows.
...
https://github.com/shirou/gopsutil/pull/312
2017-02-02 16:15:22 -08:00
Diptanu Choudhury
2a166bf7c1
Merge pull request #2273 from hashicorp/config-merge
...
Merging GC related config values
2017-02-02 13:40:29 -08:00
Diptanu Choudhury
9d44247b11
Merging GC related config values
2017-02-02 13:38:11 -08:00
Alex Dadgar
d06448cabe
Changelog
2017-02-02 11:56:05 -08:00
Alex Dadgar
df2c9ccbe5
Merge pull request #2277 from hashicorp/f-durable-uuid
...
Reproducible Node ID
2017-02-02 11:54:49 -08:00
Alex Dadgar
ae0b342269
Merge branch 'master' of github.com:hashicorp/nomad
2017-02-02 11:40:06 -08:00
Alex Dadgar
e408820587
changelog
2017-02-02 11:39:56 -08:00
Alex Dadgar
acf9e58064
Merge pull request #2278 from hashicorp/b-consul-merge
...
Fix Consul Config Merging/Copying
2017-02-02 11:39:26 -08:00
Alex Dadgar
d838cb0472
Changelog
2017-02-02 11:37:54 -08:00
Alex Dadgar
8fe389ae60
Merge pull request #2255 from hashicorp/f-vendor-serf-memberlist
...
Vendor Serf and Memberlist
2017-02-02 11:29:21 -08:00
Alex Dadgar
15a349debd
Merge pull request #2262 from hashicorp/f-permissions
...
Template destination file permissions.
2017-02-02 11:28:44 -08:00
Alex Dadgar
61a8487292
Merge branch 'f-permissions' of github.com:hashicorp/nomad into f-permissions
2017-02-02 11:28:24 -08:00
Alex Dadgar
be67eb3dcb
Grammar fix
2017-02-02 11:28:04 -08:00
Alex Dadgar
96a92c4112
Merge pull request #2270 from hashicorp/f-vault-sighup
...
Vault Client on Server handles SIGHUP
2017-02-02 11:27:15 -08:00
Alex Dadgar
17700546c3
Changelog
2017-02-02 11:26:48 -08:00
Alex Dadgar
7e213371b4
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
Alex Dadgar
7bc99125f9
Merge pull request #2275 from hashicorp/b-vault-race
...
Fix race condition with Deriving vault tokens
2017-02-02 11:19:46 -08:00
Alex Dadgar
d212d40b18
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
Sean Chittenden
b07a622ff9
Update github.com/go-ole/go-ole and remove a bit of cruft.
2017-02-01 22:51:03 -08:00
Sean Chittenden
f15fe698cc
Update github.com/StackExchange/wmi
2017-02-01 22:43:15 -08:00
Sean Chittenden
12b1ee182b
Update github.com/shirou/gopsutil and friends.
2017-02-01 22:41:29 -08:00
Sean Chittenden
2b7861630d
Update github.com/shirou/w32
2017-02-01 22:25:39 -08:00
Sean Chittenden
e4df8042e3
Slight mis-merge: secret-id in dev mode is random and needs to be returned.
2017-02-01 22:20:52 -08:00
Sean Chittenden
6c194a47c2
Generate a durable NodeID if possible, otherwise fall back to a random HostID.
2017-02-01 22:11:33 -08:00
Sean Chittenden
5f920feac2
Update github.com/shirou/gopsutil/host to include HostID update
2017-02-01 22:00:00 -08:00
Sean Chittenden
2c1ea857cd
Remove github.com/shiro/gopsutil (leave its child packages, however)
2017-02-01 21:58:19 -08:00
Alex Dadgar
91ae993ce5
Merge branch 'master' into f-vendor-serf-memberlist
2017-02-01 16:57:49 -08:00
Alex Dadgar
fea5509242
Merge branch 'master' into f-permissions
2017-02-01 16:57:46 -08:00
Alex Dadgar
37121b4cb0
Merge branch 'master' into f-vault-sighup
2017-02-01 16:57:43 -08:00
Alex Dadgar
4bf2401844
Merge branch 'master' into b-vault-race
2017-02-01 16:57:26 -08:00
Diptanu Choudhury
efc0602818
Merge pull request #2269 from hashicorp/gc-test
...
Checking in updated gc tests
2017-02-01 16:50:35 -08:00
Alex Dadgar
da072579d4
Merge branch 'master' of github.com:hashicorp/nomad
2017-02-01 16:37:14 -08:00
Alex Dadgar
569cce961e
Add role to merge test
2017-02-01 16:37:08 -08:00
Alex Dadgar
9e822a2e8f
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
Michael Schurter
2da903c04e
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
Michael Schurter
ab8e3c26da
Expand rkt port_map docs since it confused me
...
(and I wrote it)
Fixes #2272
2017-02-01 16:16:12 -08:00
Michael Schurter
5ee937357e
spel dev correktly
2017-02-01 15:29:02 -08:00
