Commits · 288fa5c21f990ca4572128fdc8617267cb2bd75a · 小白蛋 / Nomad

This project is mirrored from https://gitee.com/mirrors/nomad.git. Pull mirroring failed 2 years ago.
Repository mirroring has been paused due to too many failed attempts. It can be resumed by a project maintainer.

05 Feb, 2017 1 commit
- fix typo · 288fa5c2
  Tom Clegg authored 8 years ago
  
  288fa5c2
04 Feb, 2017 2 commits
- Update `vendor.json` to reflect shirou/gopsutil#312 being merged. · 229f97e5
  Sean Chittenden authored 8 years ago
  
  229f97e5
- reloads · b6212bc6
  Alex Dadgar authored 8 years ago
  
  b6212bc6
03 Feb, 2017 7 commits
- Changelog · 5768252f
  Alex Dadgar authored 8 years ago
  
  5768252f
- Merge pull request #2281 from dbresson/fix-reserved-merge-error · 6b99276f
  Alex Dadgar authored 8 years ago
```
avoid a nil pointer dereference
```
  6b99276f
- avoid nil pointer dereference · a49759f1
  David Bresson authored 8 years ago
  
  a49759f1
- extend config merge test to test merging to empty config · 1a6c67d1
  David Bresson authored 8 years ago
  
  1a6c67d1
- Merge pull request #2279 from hashicorp/f-windows-hostid · 52a4c927
  Alex Dadgar authored 8 years ago
```
Add durable HostID generation support to Windows.
```
  52a4c927
- Add better verification of a host's HostID. · 31333eec
  Sean Chittenden authored 8 years ago
  
  31333eec
- Add durable HostID generation support to Windows. · b24c8354
  Sean Chittenden authored 8 years ago
```
https://github.com/shirou/gopsutil/pull/312
```
  b24c8354
02 Feb, 2017 30 commits
- Merge pull request #2273 from hashicorp/config-merge · 2a166bf7
  Diptanu Choudhury authored 8 years ago
```
Merging GC related config values
```
  2a166bf7
- Merging GC related config values · 9d44247b
  Diptanu Choudhury authored 8 years ago
  
  9d44247b
- Changelog · d06448ca
  Alex Dadgar authored 8 years ago
  
  d06448ca
- Merge pull request #2277 from hashicorp/f-durable-uuid · df2c9ccb
  Alex Dadgar authored 8 years ago
```
Reproducible Node ID
```
  df2c9ccb
- Merge branch 'master' of github.com:hashicorp/nomad · ae0b3422
  Alex Dadgar authored 8 years ago
  
  ae0b3422
- changelog · e4088205
  Alex Dadgar authored 8 years ago
  
  e4088205
- Merge pull request #2278 from hashicorp/b-consul-merge · acf9e580
  Alex Dadgar authored 8 years ago
```
Fix Consul Config Merging/Copying
```
  acf9e580
- Changelog · d838cb04
  Alex Dadgar authored 8 years ago
  
  d838cb04
- Merge pull request #2255 from hashicorp/f-vendor-serf-memberlist · 8fe389ae
  Alex Dadgar authored 8 years ago
```
Vendor Serf and Memberlist
```
  8fe389ae
- Merge pull request #2262 from hashicorp/f-permissions · 15a349de
  Alex Dadgar authored 8 years ago
```
Template destination file permissions.
```
  15a349de
- Merge branch 'f-permissions' of github.com:hashicorp/nomad into f-permissions · 61a84872
  Alex Dadgar authored 8 years ago
  
  61a84872
- Grammar fix · be67eb3d
  Alex Dadgar authored 8 years ago
  
  be67eb3d
- Merge pull request #2270 from hashicorp/f-vault-sighup · 96a92c41
  Alex Dadgar authored 8 years ago
```
Vault Client on Server handles SIGHUP
```
  96a92c41
- Changelog · 17700546
  Alex Dadgar authored 8 years ago
  
  17700546
- Merge pull request #2271 from hashicorp/f-prep-0.5.5 · 7e213371
  Alex Dadgar authored 8 years ago
```
Prep for 0.5.5 and add changelog entry for #2266
```
  7e213371
- Merge pull request #2275 from hashicorp/b-vault-race · 7bc99125
  Alex Dadgar authored 8 years ago
```
Fix race condition with Deriving vault tokens
```
  7bc99125
- Fix Consul Config Merging/Copying · d212d40b
  Alex Dadgar authored 8 years ago
```
This PR fixes config merging/copying code.

Fixes https://github.com/hashicorp/nomad/issues/2264
```
  d212d40b
- Update `github.com/go-ole/go-ole` and remove a bit of cruft. · b07a622f
  Sean Chittenden authored 8 years ago
  
  b07a622f
- Update `github.com/StackExchange/wmi` · f15fe698
  Sean Chittenden authored 8 years ago
  
  f15fe698
- Update github.com/shirou/gopsutil and friends. · 12b1ee18
  Sean Chittenden authored 8 years ago
  
  12b1ee18
- Update `github.com/shirou/w32` · 2b786163
  Sean Chittenden authored 8 years ago
  
  2b786163
- Slight mis-merge: secret-id in dev mode is random and needs to be returned. · e4df8042
  Sean Chittenden authored 8 years ago
  
  e4df8042
- Generate a durable NodeID if possible, otherwise fall back to a random HostID. · 6c194a47
  Sean Chittenden authored 8 years ago
  
  6c194a47
- Update github.com/shirou/gopsutil/host to include HostID update · 5f920fea
  Sean Chittenden authored 8 years ago
  
  5f920fea
- Remove github.com/shiro/gopsutil (leave its child packages, however) · 2c1ea857
  Sean Chittenden authored 8 years ago
  
  2c1ea857
- Merge branch 'master' into f-vendor-serf-memberlist · 91ae993c
  Alex Dadgar authored 8 years ago
  
  91ae993c
- Merge branch 'master' into f-permissions · fea55092
  Alex Dadgar authored 8 years ago
  
  fea55092
- Merge branch 'master' into f-vault-sighup · 37121b4c
  Alex Dadgar authored 8 years ago
  
  37121b4c
- Merge branch 'master' into b-vault-race · 4bf24018
  Alex Dadgar authored 8 years ago
  
  4bf24018
- Merge pull request #2269 from hashicorp/gc-test · efc06028
  Diptanu Choudhury authored 8 years ago
```
Checking in updated gc tests
```
  efc06028