Armon Dadgar
d6b37a9400
Merge pull request #480 from epankala/consul_version
...
Make the 'consul version' to return value that is from 'git describe --tags'
2014-11-19 10:59:38 -08:00
Armon Dadgar
e9c7b1df93
consul: Increase maximum number of parallel readers
2014-11-18 18:46:43 -08:00
Atin Malaviya
61f1d24f39
consul.Config() helper to generate the tlsutil.Config{} struct, 30 second keepalive, use keepalive for HTTP and HTTPS
2014-11-18 17:56:48 -05:00
Janne Paenkaelae
e6b6f18172
Make the 'consul version' to return value that is from 'git describe --tags'
2014-11-18 22:15:58 +00:00
Armon Dadgar
3b3f082283
Merge pull request #477 from amalaviy/retry_wan_join
...
Add start-wan-join, retry-wan-join and related configuration and commandline options
2014-11-18 13:28:43 -08:00
Atin Malaviya
f1f8c88228
Moved TLS Config stuff to tlsutil package
2014-11-18 11:03:36 -05:00
Atin Malaviya
0904c651a8
Change names to StartJoinWan, RetryJoinWan etc
2014-11-17 17:14:59 -05:00
Atin Malaviya
f4fd8453ed
Added HTTPS support via a new HTTPS Port configuration option similar to the HTTP Port.
2014-11-17 14:29:35 -05:00
Ryan Uber
09493061d8
deps: add 0.4.1 deps file, rename 0-4.1 to match naming convention
2014-11-15 22:40:36 -08:00
Atin Malaviya
5b41170f47
Add start-wan-join, retry-wan-join and related configuration options and commandline options
2014-11-14 10:56:39 -05:00
Armon Dadgar
2fafac5aa7
Merge pull request #471 from lra/doc_acl_rexec
...
Doc explaining the blacklist mode and consul exec
2014-11-13 16:20:07 -08:00
Laurent Raufaste
6e69b3e40d
Another typo
2014-11-13 17:44:20 -05:00
Laurent Raufaste
7f73e03b0b
extra '
2014-11-13 17:43:25 -05:00
Laurent Raufaste
29aaffdc37
Doc explaining the blacklist mode and consul exec
2014-11-13 17:42:39 -05:00
Ryan Uber
3facf1bdf4
website: better description of config merging in agent options. Closes #470
2014-11-13 12:04:09 -08:00
Seth Vargo
25d467805a
Merge pull request #469 from lyrixx/patch-1
...
[Doc] Added missing link to leader-election
2014-11-13 11:08:06 -05:00
Grégoire Pineau
b3ef4b8881
[Doc] Added missing link to leader-election
2014-11-13 16:56:07 +01:00
Armon Dadgar
8a1969cc8c
consul: Fixing key list index calculation
2014-11-12 17:55:45 -08:00
Armon Dadgar
bd612b7bc2
Merge pull request #462 from vindir/feature/typo-fix
...
Typo fix for events command doc
2014-11-10 14:42:33 -08:00
Jamey Owens
8c5bf1ca25
Typo fix for events command doc
2014-11-10 16:37:18 -05:00
Ryan Uber
1b63cbf21e
Merge pull request #458 from hashicorp/h-notes
...
Pass notes field from service checks through
2014-11-06 21:07:45 -08:00
Ryan Uber
df5859580f
agent: pass notes field through for checks inside of service definitions. Fixes #449
2014-11-06 18:25:21 -08:00
Seth Vargo
de1b929dd0
Merge pull request #455 from neilbaylorrulez/patch-1
...
improved Parallax scrolling performance in webkit
2014-11-05 12:18:38 -05:00
Neil Taylor
dee778610f
improved Parallax scrolling performance in webkit
2014-11-05 12:08:35 -05:00
Ryan Uber
bfb9b9b4af
Merge pull request #453 from dpb587/patch-typos
...
Fix some typos in website docs
2014-11-04 21:54:49 -08:00
Danny Berger
3da9291ae1
Fix some typos in website docs
2014-11-04 21:33:42 -07:00
Armon Dadgar
cf7e9e40d5
Fixing unit tests
2014-11-03 11:40:55 -08:00
Armon Dadgar
cd936793ad
Support old recursor config for backwards compatibility
2014-11-03 11:28:21 -08:00
Armon Dadgar
632bbcdd54
Merge pull request #448 from foostan/multiple_recursor
...
Add multiple recursor definition support
2014-11-03 11:18:37 -08:00
Armon Dadgar
f21db4e2ee
Merge pull request #450 from ceh/fix-missing-arguments
...
Fix missing arguments
2014-11-01 15:23:36 -07:00
Emil Hessman
c9333b1b9b
Fix missing arguments
2014-11-01 22:56:48 +01:00
foostan
35b006d884
Add multiple recursor definition support
2014-11-01 04:26:26 +09:00
Armon Dadgar
8a013f2a09
Merge pull request #444 from lra/acl_doc_clarification
...
Acl doc clarification
2014-10-31 10:46:29 -07:00
Laurent Raufaste
26916b03e6
Rephrase
2014-10-30 21:46:19 -04:00
Laurent Raufaste
33c0de708d
ACL doc clarification
...
Fixes #443
2014-10-30 21:44:23 -04:00
Seth Vargo
38448015e1
Merge pull request #441 from tomlanyon/master
...
website: fix download link for web UI in intro guide.
2014-10-28 02:11:29 -04:00
Tom Lanyon
d3a3ccb257
website: fix download link for web UI in intro guide.
2014-10-28 15:21:32 +10:30
Ryan Uber
1756d14e01
Merge pull request #433 from hashicorp/f-multi-checks
...
agent: add support for multiple checks and config mixing
2014-10-27 11:58:36 -07:00
Ryan Uber
d472825181
website: fix JSON in multiple checks documentation
2014-10-27 11:58:01 -07:00
Seth Vargo
2a4bb1bdf7
Force a bundle update for rack-rewrite
2014-10-27 11:02:02 -04:00
Seth Vargo
193062f038
Merge pull request #435 from hashicorp/sethvargo/no_index
...
Do not index "Jespen" code block
2014-10-27 10:36:13 -04:00
Seth Vargo
d1a0adf6ca
Do not index "Jespen" code block
...
The word "Jespen" is one of our top keywords because it appears so many times
in the Jespen Testing page. This commit adds a comment to disable Google
indexing in that code block so we can better target keywords.
2014-10-26 22:34:14 -04:00
Seth Vargo
14ae938a76
Merge pull request #436 from hashicorp/sethvargo/redirect_web_ui_downloads
...
Redirect old WebUI downloads page to new one
2014-10-26 22:30:24 -04:00
Seth Vargo
cd7dca5f02
Redirect old WebUI downloads page to new one
...
There are currently a number of sites on the Internet that link to the old
downloads_web_ui.html page, including some popular blog posts. Since the WebUI
has been moved onto the Consul page itself, these links are now broken.
This commit adds a 301 (to preserve SEO) redirect from the old page to the new
one.
2014-10-26 22:21:45 -04:00
Ryan Uber
f03bbb8daa
website: update docs for multiple checks in config
2014-10-26 13:25:48 -07:00
Ryan Uber
28f31a8dd8
agent: add support for multiple checks and config mixing
2014-10-26 13:11:25 -07:00
Ryan Uber
c1dfa55859
agent: test config as a whole in services test
2014-10-26 12:00:11 -07:00
Ryan Uber
0eb5bef0d6
Merge pull request #431 from soundcloud/xla-multiple-service-definitions
...
Add multiple service definition support
2014-10-26 11:50:55 -07:00
Alexander Simmerl
461c1e18a5
Add multiple service definition support
...
This change-set adds another key to the configuration decoding called
`services`, which is expected to be a list of service definitions. It
follows the established convention of only allowing one of the keys:
`service`, `check`, `services`. For every entry in the list it calls
the corresponding decode method and appends it to the Servics of the
resulting Config.
While a similar result could be achieved with changing the Services
member of the Config struct to have named mapstruct tag it lacks the
proper time conversions provided by DecodeServiceDefinition.
2014-10-23 22:50:40 -04:00
Armon Dadgar
21c3e606a2
website: Fixing formatting
2014-10-23 17:14:40 -07:00