Commit Graph

6064 Commits

Author SHA1 Message Date
Diptanu Choudhury 0a70ee3924 Merge branch 'master' of github.com:hashicorp/nomad 2016-11-10 15:40:09 -08:00
Diptanu Choudhury f7d8950df8 Updated http response for server members 2016-11-10 15:39:53 -08:00
Alex Dadgar 972c57ef9a Merge branch 'master' of github.com:hashicorp/nomad 2016-11-10 15:24:19 -08:00
Alex Dadgar d7d1662753 changelog 2016-11-10 15:24:08 -08:00
Alex Dadgar eba98da487 Merge pull request #1977 from hashicorp/b-volume-mount
Change relative path from joining against the alloc dir to the task's directory.
2016-11-10 15:20:49 -08:00
Alex Dadgar a11d66f639 Remove todo 2016-11-10 15:20:19 -08:00
Alex Dadgar d65150a832 Merge pull request #1978 from hashicorp/b-consul-renew
Always disable renew_token for CT config
2016-11-10 15:19:21 -08:00
Alex Dadgar 74a736155c Always disable renew_token for CT config
This PR makes Nomad always disable token renewal even if Vault is
disabled. The problem was when there was a vault token in the
environment variable and Nomad/Vault integration was disabled, the
template runner would still try to renew the token.
2016-11-10 15:16:08 -08:00
Alex Dadgar eea35626b7 Changes the relative path from joining against the alloc dir to the
task's directory.

This PR changes the behavior when given a relative host path when
mounting docker containers. Prior to this, the behavior was to mount by
joining against the alloc/ directory. This PR changes it to be against
the task/ directory.
2016-11-10 14:47:54 -08:00
Michael Schurter 345a2640dc Fix tlsutil tests 2016-11-10 12:18:13 -08:00
Alex Dadgar e322f5c070 Move parsing of vault token above validation such that it works in dev mode 2016-11-10 11:47:43 -08:00
root 1708a55015
Release v0.5.0-rc2 2016-11-10 19:11:32 +00:00
root 8c1bdc0342
Release v0.5.0-rc2 2016-11-10 19:08:15 +00:00
Michael Schurter 24ff5fc5b4 Merge pull request #1972 from hashicorp/b-update-advertise-docs
Update address docs to match behavior in #1955
2016-11-10 10:42:01 -08:00
Diptanu Choudhury 7b05f3828f Bumped up version 2016-11-10 10:39:15 -08:00
Alex Dadgar b3c5678e77 changelog 2016-11-10 10:28:55 -08:00
Alex Dadgar 669d834b56 Merge pull request #1974 from hashicorp/b-spaces
Do not validate the command does not contain spaces.
2016-11-10 10:27:58 -08:00
Alex Dadgar e8d6227b20 Do not validate the command does not contain spaces.
This PR removes validation that the command string does not contain
spaces. This can cause issues where the path contains a folder that
includes a space ("C:\Program Files\Python35\python.exe").

Fixes #1737
2016-11-10 10:22:17 -08:00
Alex Dadgar b63273b81f Merge pull request #1973 from maier/master
vendor circonus
2016-11-09 16:47:38 -08:00
matt maier 276af02188 revert to previous circonusllhist 2016-11-09 19:33:12 -05:00
Michael Schurter 702416f508 Update address docs to match behavior in #1955 2016-11-09 16:15:56 -08:00
Michael Schurter 8b0511713f Merge pull request #1955 from hashicorp/b-fix-default-advertise
Choose safer default advertise address
2016-11-09 16:03:17 -08:00
Michael Schurter cb1e2d2194 Fix comment 2016-11-09 15:51:00 -08:00
Alex Dadgar 5fba85c092 get tlsutil tests to compile - need to regenerate the certificates 2016-11-09 14:41:08 -08:00
Alex Dadgar 6c4060c014 Merge pull request #1969 from maier/master
Vendor circonus
2016-11-09 14:29:53 -08:00
Michael Schurter 5b4389be52 Merge pull request #1970 from hashicorp/b-fix-rkt-docs
Remove warning since #1862 added ports support
2016-11-09 14:27:03 -08:00
Michael Schurter 5216e9c395 Remove warning since #1862 added ports support 2016-11-09 13:57:12 -08:00
Michael Schurter c301e696cf Fix typo in test 2016-11-09 13:16:56 -08:00
matt maier c6504f3418 Update Circonus integration expose Check Display Name and Check Tags
configuration options.
2016-11-09 15:12:30 -05:00
matt maier 525c7710a4 Update `vendor circonus-labs/circonus-gometrics`
Update `vendor circonus-labs/circonus-gometrics/checkmgr`
Update `vendor circonus-labs/circonus-gometrics/api`
Update `vendor circonus-labs/circonusllhist`
2016-11-09 15:10:42 -05:00
Michael Schurter fdc5aa5a50 Add unit test for missing port helper func 2016-11-09 11:55:10 -08:00
Michael Schurter a75e5b5803 Addresses are just addresses - no ports
Store address+port in an unexported field for ease-of-use
2016-11-09 11:49:55 -08:00
Alex Dadgar 96ada5a4fe changelog 2016-11-09 10:32:31 -08:00
Alex Dadgar ee921ccbb2 Merge pull request #1949 from carlpett/blacklist-fingerprints-and-drivers
Support blacklisting fingerprinters
2016-11-09 10:31:17 -08:00
Calle Pettersson 4304755c12 Address comments from PR 2016-11-09 11:50:16 +01:00
Diptanu Choudhury 84a47b1a4c Merge pull request #1967 from hashicorp/ephemeral_migrate
Fixing the upgrade path for ephemeral disk
2016-11-08 17:07:22 -08:00
Diptanu Choudhury 7ea3efbd28 Added a warning message if disk attribute is non zero 2016-11-08 17:06:37 -08:00
Michael Schurter 23de99b1df Enable dev mode to allow using localhost in tests 2016-11-08 16:35:11 -08:00
Michael Schurter f1120e4de0 Fix test that fails now that advertise can't be localhost 2016-11-08 16:22:04 -08:00
Michael Schurter 290f71f62e Restore sync/atomic use for consistency 2016-11-08 16:21:52 -08:00
Michael Schurter 293c596411 Normalize configs for agent tests 2016-11-08 16:13:09 -08:00
Alex Dadgar 6ecc0aab70 Merge branch 'master' of github.com:hashicorp/nomad 2016-11-08 16:07:04 -08:00
Alex Dadgar 4c2748db51 vendor circonus 2016-11-08 16:06:55 -08:00
Michael Schurter 6d83a192cf Fix int pointer formatting and server config test 2016-11-08 16:02:20 -08:00
Diptanu Choudhury e057c39ea1 Fixed a test 2016-11-08 15:48:47 -08:00
Michael Schurter 4235d65011 Move config normalization into config.go to ease testing 2016-11-08 15:44:10 -08:00
Diptanu Choudhury 2af135ce15 Updated Changelog 2016-11-08 15:42:44 -08:00
Alex Dadgar 3039339f21 changelog 2016-11-08 15:41:44 -08:00
Alex Dadgar fe9a200979 Merge pull request #1952 from hashicorp/b-reserved-ports-aws
Run environmental fingerprinters after host fingerprinters and AWS overrides network
2016-11-08 15:35:46 -08:00
Alex Dadgar 20a5b6fa6b Merge pull request #1965 from hashicorp/b-docker-interpolate
Interpolate all docker driver configs that are strings
2016-11-08 15:35:27 -08:00