Commit Graph

5926 Commits

Author SHA1 Message Date
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
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
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
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
Diptanu Choudhury e057c39ea1 Fixed a test 2016-11-08 15:48:47 -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
Alex Dadgar 3b33f49cde Merge pull request #1966 from hashicorp/b-service-interpolate
Interpolate all service/check fields
2016-11-08 15:35:19 -08:00
Diptanu Choudhury 56ed1d3cd8 Fixing the upgrade path for ephemeral disk 2016-11-08 15:24:51 -08:00
Alex Dadgar f1689bc7f9 Rkt env var 2016-11-08 15:14:04 -08:00
Alex Dadgar ddf101d7a2 Interpolate all check related variables 2016-11-08 14:43:46 -08:00
Alex Dadgar 691e09f863 remove debug 2016-11-08 14:21:37 -08:00
Alex Dadgar 9f2c0cb0c2 Interpolate everything that is a string 2016-11-08 14:20:51 -08:00
Diptanu Choudhury 19524f4007 Merge pull request #1963 from hashicorp/fix-test
Fixed a test
2016-11-08 13:02:19 -08:00
Diptanu Choudhury a70fbd7cf1 Fixed a test 2016-11-08 13:01:56 -08:00
Diptanu Choudhury e4fdb849f9 Merge pull request #1960 from hashicorp/fix-perm-issues
Fixed permission issues on client
2016-11-08 12:57:18 -08:00
Diptanu Choudhury d9f8e3a75a Fixed comments 2016-11-08 12:55:15 -08:00
Alex Dadgar 94cb48af08 Merge pull request #1962 from hashicorp/b-env-vars
Fix env vars relating to secretdir
2016-11-08 12:36:16 -08:00
Alex Dadgar 742e11ddb4 Fix env vars relating to secretdir 2016-11-08 12:28:43 -08:00
Alex Dadgar 29eb3bd1c1 Merge pull request #1961 from hashicorp/b-vault
Fix marking unrecoverable errors as recoverable when deriving Vault token
2016-11-08 11:09:50 -08:00
Alex Dadgar 822e32de6d Fix error checking 2016-11-08 11:04:11 -08:00
Diptanu Choudhury 2132fbb68a Fixed permission issues on client 2016-11-08 10:57:29 -08:00
Alex Dadgar 981fabdb26 Add unrecoverable test 2016-11-08 10:38:54 -08:00
Alex Dadgar 21a317a21c Merge pull request #1957 from hashicorp/docs-vault-example
~ docs: Vault Example Configuration fixes
2016-11-08 09:40:56 -08:00
Alex Dadgar 79e55a9797 Merge pull request #1954 from hashicorp/b-secret-id
Add compatibility code for secret ID while upgrading cluster in both …
2016-11-08 09:39:52 -08:00
Calle Pettersson 8632696e2d Add blacklisting of drivers 2016-11-08 18:30:07 +01:00
Calle Pettersson b603bb007e Add blacklisting of fingerprinters 2016-11-08 18:29:44 +01:00
Cameron Stokes d31acb70be ~ docs: Vault Example Configuration fixes
- add `-L` to follow redirect when downloading example config files (file is linked to root, but gets redirected to _www_).
- fix role name to match recommendation
2016-11-07 21:35:14 -08:00
Alex Dadgar 9015e79aaa Add compatibility code for secret ID while upgrading cluster in both server/client mode on single nodes 2016-11-07 16:52:08 -08:00
Diptanu Choudhury 3f7c278908 Merge pull request #1947 from hashicorp/f-server-members-rpc
Add an RPC endpoint for server members
2016-11-07 14:11:19 -08:00
Diptanu Choudhury 1e54965ea3 Updated changelog 2016-11-07 14:10:57 -08:00
Alex Dadgar 1cf22dff08 Merge pull request #1953 from bastiaanb/b-alloc-runner-nil-pointer
use snap.Alloc.TaskStates only after confirming snap.Alloc is not nil
2016-11-07 14:00:13 -08:00
Bastiaan Bakker 2c864172eb use snap.Alloc.TaskStates only after confirming snap.Alloc is not nil 2016-11-07 22:35:00 +01:00
Alex Dadgar 46893c7558 Merge pull request #1921 from hashicorp/f-abs-templ
Allow absolute paths for template sources
2016-11-07 12:28:49 -08:00
Alex Dadgar 92f526d902 Run environmental fingerprinters after host fingerprinters and do an override 2016-11-07 12:21:50 -08:00
Diptanu Choudhury a1b4b20eff Changing the API to use the new servermember datastructure 2016-11-06 10:30:43 -08:00
Diptanu Choudhury 9e0507e878 Add an RPC endpoint for server members 2016-11-06 10:16:12 -08:00
Diptanu Choudhury 15f085a4d7 Merge pull request #1931 from hashicorp/rename-vault-config
Rename vault config
2016-11-06 10:14:25 -08:00
Diptanu Choudhury d1345b9294 Fixed docs 2016-11-04 17:22:22 -07:00
Alex Dadgar 960424f086 Merge pull request #1941 from hashicorp/b-complete-transistion
Task state "dead" is terminal
2016-11-04 17:16:10 -07:00