Commit Graph

6586 Commits

Author SHA1 Message Date
Jeff Mitchell
f4a08a193d Update go-cleanhttp 2017-02-10 19:41:28 -05:00
Alex Dadgar
6487deb533 Merge branch 'master' of github.com:hashicorp/nomad 2017-02-10 16:29:36 -08:00
Alex Dadgar
60d1e80461 Add guard 2017-02-10 16:29:28 -08:00
Michael Schurter
87a126b017 Merge pull request #2301 from hashicorp/b-fix-nil-resources
Fix upgrade path for created resources
2017-02-10 16:24:55 -08:00
Michael Schurter
c6e78e2939 Fix test to assert new never-nil behavior 2017-02-10 10:11:15 -08:00
Michael Schurter
a760fbcea6 Use getters & setters with nil guards 2017-02-09 17:44:58 -08:00
Michael Schurter
c961e751ec Fix upgrade path for created resources
This *might* be a fix for #2295 -- I've been unable to reproduce the
bug. However, this guard seems wise regardless. I should never be
overwriting an intialized created resources with a nil.
2017-02-09 13:54:33 -08:00
Seth Vargo
a16709ef43 Merge pull request #2298 from hashicorp/sethvargo-patch-1
Change cache to 4h
2017-02-09 14:38:51 -05:00
Seth Vargo
a10a0a40f6 Cache assets longer 2017-02-09 14:38:46 -05:00
Seth Vargo
d1d9e5ab30 Change cache to 4h 2017-02-09 14:37:36 -05:00
Michael Schurter
a703bcfede Merge pull request #2297 from hashicorp/b-fix-arm-build
Fix 32bit arm build
2017-02-09 11:32:32 -08:00
Michael Schurter
5bb805cc5e Fix 32bit arm build
Had to use the hack from https://github.com/golang/go/issues/12443
2017-02-09 11:22:17 -08:00
Alex Dadgar
c1bc077d32 Vendor memberlist fixes 2017-02-08 16:07:33 -08:00
Alex Dadgar
15b2697288 Merge pull request #2282 from hashicorp/f-raft-v2-stage-one
Update to Raft V2 stage one
2017-02-08 15:26:16 -08:00
Alex Dadgar
4f84eec2bb Merge pull request #2293 from hashicorp/f-vendor-memdb
Vendor MemDB
2017-02-08 14:51:01 -08:00
Alex Dadgar
e0c2221e07 Respond to comments 2017-02-08 14:50:19 -08:00
Alex Dadgar
ff5c22acaa Fix missing summary restoration 2017-02-08 11:51:48 -08:00
Alex Dadgar
9ff8517392 Add abandon tests and use snapshot for blocking queries 2017-02-08 11:18:03 -08:00
Sean Chittenden
a5cb376f9d Update vendor/vendor.json to reflect shiriou/gopsutil#313 being merged. 2017-02-07 22:41:43 -08:00
Alex Dadgar
658c1eeb43 Fix nomad tests 2017-02-07 22:10:33 -08:00
Alex Dadgar
43ab32f96c Tests compile 2017-02-07 21:30:57 -08:00
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
8d189a5dcc Merge pull request #2288 from hashicorp/b-lower-hostid
Lowercase NodeID
2017-02-06 16:26:04 -08:00
Sean Chittenden
c3c44d27fc Unconditionally lowercase the node ID read from disk. 2017-02-06 16:20:17 -08:00
Sean Chittenden
cf9c432dd8 Update shirou/gopsutil to shiriou/gopsutil#313 to pull in the lowercase HostID bits 2017-02-06 16:16:20 -08:00
Alex Dadgar
55da5c16e1 Merge pull request #2287 from hashicorp/sethvargo/comments
Fix comments on parameterized jobs
2017-02-06 11:25:19 -08:00
Seth Vargo
0394abacc7 Fix comments on parameterized jobs 2017-02-06 13:59:07 -05:00
Alex Dadgar
5c73b84fb0 Merge pull request #2284 from tomclegg/patch-1
fix typo
2017-02-06 10:26:19 -08:00
Alex Dadgar
3e4c8672c0 Add windows exe extension 2017-02-05 13:17:13 -08:00
Alex Dadgar
1951242869 Fix forwarded recoverable error 2017-02-05 13:14:24 -08:00
Alex Dadgar
4cbc72678e Use watchset on getter methods 2017-02-05 12:45:57 -08:00
Tom Clegg
288fa5c21f fix typo 2017-02-05 12:12:15 -08:00
Alex Dadgar
7128558aeb Update state store and blocking query helper 2017-02-05 12:03:11 -08:00
Sean Chittenden
229f97e535 Update vendor.json to reflect shirou/gopsutil#312 being merged. 2017-02-03 22:35:07 -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
Alex Dadgar
b03e73d4a2 Fix bootstrap tests 2017-02-03 13:00:28 -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
7a1bdf9696 Tests build 2017-02-02 17:50:06 -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
Alex Dadgar
90f71651e3 It builds 2017-02-02 16:07:15 -08:00
Alex Dadgar
7d13e3bdd9 Join + Leave peer 2017-02-02 15:49:06 -08:00
Alex Dadgar
0a7f95589b Update setupRaft 2017-02-02 15:31:36 -08:00