Commit graph

6671 commits

Author SHA1 Message Date
Alex Dadgar 04862ca10e Tests compile 2017-02-07 21:30:57 -08:00
Alex Dadgar b69b357c7f Nomad builds 2017-02-07 20:31:23 -08:00
Alex Dadgar 36d018514b Fix test 2017-02-07 11:35:38 -08:00
Alex Dadgar bc2e6b0cc2 Fix state store tests 2017-02-06 16:46:23 -08:00
Alex Dadgar 610d39ab82 Merge pull request #2288 from hashicorp/b-lower-hostid
Lowercase NodeID
2017-02-06 16:26:04 -08:00
Sean Chittenden c4c321c770
Unconditionally lowercase the node ID read from disk. 2017-02-06 16:20:17 -08:00
Sean Chittenden 6908aa7ed0
Update shirou/gopsutil to shiriou/gopsutil#313 to pull in the lowercase HostID bits 2017-02-06 16:16:20 -08:00
Alex Dadgar d934b541e7 Merge pull request #2287 from hashicorp/sethvargo/comments
Fix comments on parameterized jobs
2017-02-06 11:25:19 -08:00
Seth Vargo 675b7f7fc1
Fix comments on parameterized jobs 2017-02-06 13:59:07 -05:00
Alex Dadgar 71891f89e2 Merge pull request #2284 from tomclegg/patch-1
fix typo
2017-02-06 10:26:19 -08:00
Alex Dadgar d318e5bc38 Add windows exe extension 2017-02-05 13:17:13 -08:00
Alex Dadgar 6f9866ca69 Fix forwarded recoverable error 2017-02-05 13:14:24 -08:00
Alex Dadgar c026a97ce7 Use watchset on getter methods 2017-02-05 12:45:57 -08:00
Tom Clegg 0b3372c064 fix typo 2017-02-05 12:12:15 -08:00
Alex Dadgar 570efcaebd Update state store and blocking query helper 2017-02-05 12:03:11 -08:00
Sean Chittenden d218f5bc84
Update vendor.json to reflect shirou/gopsutil#312 being merged. 2017-02-03 22:35:07 -08:00
Alex Dadgar 94263b9648 Vendor 2017-02-03 16:28:27 -08:00
Alex Dadgar e6863e4c01 reloads 2017-02-03 16:12:21 -08:00
Alex Dadgar 3bd4774a16 Changelog 2017-02-03 14:28:29 -08:00
Alex Dadgar afbec444ec Merge pull request #2281 from dbresson/fix-reserved-merge-error
avoid a nil pointer dereference
2017-02-03 14:27:07 -08:00
Alex Dadgar da89b1cde6 Fix bootstrap tests 2017-02-03 13:00:28 -08:00
David Bresson 1c81a71f13 avoid nil pointer dereference 2017-02-03 08:39:57 -08:00
David Bresson e7a7690815 extend config merge test to test merging to empty config 2017-02-03 08:35:18 -08:00
Alex Dadgar 419bf2c497 Tests build 2017-02-02 17:50:06 -08:00
Alex Dadgar 13c270a2cd 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 adb5be23ef
Add better verification of a host's HostID. 2017-02-02 16:24:32 -08:00
Sean Chittenden 16a5e2f918
Add durable HostID generation support to Windows.
https://github.com/shirou/gopsutil/pull/312
2017-02-02 16:15:22 -08:00
Alex Dadgar ee368762ae It builds 2017-02-02 16:07:15 -08:00
Alex Dadgar 26db1bd12c Join + Leave peer 2017-02-02 15:49:06 -08:00
Alex Dadgar ac10aed731 Update setupRaft 2017-02-02 15:31:36 -08:00
Alex Dadgar 78cfcd2724 Bump protocol version and update numOtherPeers 2017-02-02 13:52:31 -08:00
Diptanu Choudhury 10b999367a Merge pull request #2273 from hashicorp/config-merge
Merging GC related config values
2017-02-02 13:40:29 -08:00
Diptanu Choudhury d0fe4a67a5 Merging GC related config values 2017-02-02 13:38:11 -08:00
Alex Dadgar 59594f5178 Vendor v2 stage one 2017-02-02 13:19:08 -08:00
Alex Dadgar 0d9550c3b7 Changelog 2017-02-02 11:56:05 -08:00
Alex Dadgar d1f8301e73 Merge pull request #2277 from hashicorp/f-durable-uuid
Reproducible Node ID
2017-02-02 11:54:49 -08:00
Alex Dadgar 5ca117bd09 Merge branch 'master' of github.com:hashicorp/nomad 2017-02-02 11:40:06 -08:00
Alex Dadgar 1f6879e7ab changelog 2017-02-02 11:39:56 -08:00
Alex Dadgar b951b84b44 Merge pull request #2278 from hashicorp/b-consul-merge
Fix Consul Config Merging/Copying
2017-02-02 11:39:26 -08:00
Alex Dadgar de16113630 Changelog 2017-02-02 11:37:54 -08:00
Alex Dadgar 564d08b950 Merge pull request #2255 from hashicorp/f-vendor-serf-memberlist
Vendor Serf and Memberlist
2017-02-02 11:29:21 -08:00
Alex Dadgar 1562a7aeee Merge pull request #2262 from hashicorp/f-permissions
Template destination file permissions.
2017-02-02 11:28:44 -08:00
Alex Dadgar 253f835667 Merge branch 'f-permissions' of github.com:hashicorp/nomad into f-permissions 2017-02-02 11:28:24 -08:00
Alex Dadgar 1a960ee5cd Grammar fix 2017-02-02 11:28:04 -08:00
Alex Dadgar d0021c2153 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 8daa713887 Changelog 2017-02-02 11:26:48 -08:00
Alex Dadgar 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
Alex Dadgar 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
Alex Dadgar 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
Sean Chittenden 52a22bcded
Update github.com/go-ole/go-ole and remove a bit of cruft. 2017-02-01 22:51:03 -08:00