Commit Graph

1660 Commits

Author SHA1 Message Date
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
Armon Dadgar c7d5330471 Merge pull request #427 from blalor/agent_http_links
website: Improve navigability of agent HTTP API categories
2014-10-23 16:46:58 -07:00
Ryan Uber 805a9f7ec2 website: document retry_join and retry_interval flags for config file 2014-10-23 16:40:49 -07:00
Armon Dadgar 21012f58c6 Merge pull request #429 from lra/doc_fix
Small typo in the doc
2014-10-23 12:55:03 -07:00
Laurent Raufaste cba968ad4d Small typo in the doc 2014-10-23 14:32:11 -04:00
Mitchell Hashimoto ab39598695 Merge pull request #426 from leocassarani/patch-1
website: Fix spelling of "separator" in the HTTP API docs
2014-10-23 08:28:09 -07:00
Brian Lalor 914db50a52 Add links for status endpoints 2014-10-23 07:59:58 -04:00
Brian Lalor dd251dd323 Add links for event endpoints 2014-10-23 07:59:05 -04:00
Brian Lalor f09d1b32c9 Add links for ACL endpoints 2014-10-23 07:57:55 -04:00
Brian Lalor 8d6b8f4309 Add links for session endpoints 2014-10-23 07:56:28 -04:00
Brian Lalor 03be420bce Add links for health endpoints 2014-10-23 07:54:46 -04:00
Brian Lalor c7125bad12 Add links for catalog endpoints 2014-10-23 07:53:11 -04:00
Brian Lalor 98ebb94afa Add links for agent endpoints 2014-10-23 07:50:54 -04:00
Brian Lalor 351d722a15 Improve navigability of agent HTTP API categories 2014-10-23 07:44:20 -04:00
Leo Cassarani 64f710518f Fix spelling of "separator" in the HTTP API docs 2014-10-23 12:31:41 +01:00
Seth Vargo cb4b11e899 Create unified "Consul Tools" page to showcase our tools and the communities 2014-10-21 18:22:53 -04:00
Seth Vargo b022a64f2a Fix the duplicate navigation active classes 2014-10-21 16:42:38 -04:00
Seth Vargo 880417397c Fix small typo in link 2014-10-21 16:38:44 -04:00
Seth Vargo f3b5fb3962 Fix copy-paste fail 2014-10-21 16:32:58 -04:00
Jack Pearkes 3a9dfad7a4 Merge pull request #416 from hashicorp/sethvargo/download_consul_template
Add Consul Template to the download list
2014-10-21 16:32:18 -04:00
Seth Vargo 42b00a856e Add Consul Template to the download list 2014-10-21 16:24:00 -04:00
Armon Dadgar 66fbf95b79 website: Fixing link to demo cluster 2014-10-20 13:18:24 -07:00
Armon Dadgar 13ebb1a141 Merge pull request #409 from mark-rushakoff/fuller-vagrantfile
Install curl in vagrant-cluster demo's Vagrantfile
2014-10-20 10:57:51 -07:00
Armon Dadgar 885b2d9fb1 Bump website version 2014-10-20 10:42:06 -07:00
Armon Dadgar 541b98a926 Gofmt 2014-10-20 10:21:31 -07:00
Armon Dadgar aaddfa2ba9 CHANGELOG updates 2014-10-20 10:20:13 -07:00
Seth Vargo 6763d8895b Merge pull request #412 from ErikDubbelboer/website-fix
Fix small doc mistake
2014-10-20 06:39:03 -07:00
Erik Dubbelboer 5b4be8fd98 Fix small doc mistake 2014-10-20 06:26:38 +00:00
Seth Vargo 11ef616aed Merge pull request #411 from hashicorp/sethvargo/more_website_updates
SEO and latest middleman goodness
2014-10-19 18:22:51 -07:00
Seth Vargo a623b4340a Update gems to latest versions 2014-10-19 19:42:41 -04:00
Seth Vargo 869b194127 Use new Markdown syntaxes and add SEO descriptions 2014-10-19 19:42:13 -04:00
Seth Vargo af756f1ea6 Use a description attribute for HTML descriptions 2014-10-19 19:41:12 -04:00
Seth Vargo 64c5a4f157 Import fonts in CSS instead of HTML 2014-10-19 19:41:12 -04:00
Seth Vargo 3712748441 Move more javascript into the footer 2014-10-19 19:41:12 -04:00
Seth Vargo 281ca84d88 Cleanup header HTML 2014-10-19 19:41:12 -04:00
Seth Vargo 283c7c1c46 Add robots.txt and sitemap 2014-10-19 19:41:12 -04:00
Seth Vargo b5d5af813a Do not underline API doc links 2014-10-19 19:41:11 -04:00
Seth Vargo b0045c4e13 Remove prettify css 2014-10-19 19:41:11 -04:00
Seth Vargo 302789bf76 Use codeblocks for code 2014-10-19 19:41:11 -04:00
Seth Vargo a00b32dca2 Remove highlighting javascript files 2014-10-19 19:41:11 -04:00
Seth Vargo bdc28e8dfe Remove unused font file 2014-10-19 19:41:11 -04:00
Mark Rushakoff c5c59438bc Install curl
The getting started guide mentions has several examples using curl, so
preinstall curl on the Vagrant box to make the guide easier to follow.
2014-10-17 21:39:44 -07:00
Armon Dadgar 3761867ced CHANGELOG updates 2014-10-17 18:48:51 -07:00
Armon Dadgar ce4aa7beb5 Switching to the pinned version of msgpack 2014-10-17 18:26:19 -07:00
Armon Dadgar ad445f5ac2 Encode/Decode test 2014-10-17 18:23:13 -07:00
Armon Dadgar f37f5fde54 consul: Improving test reliability 2014-10-17 17:40:14 -07:00
Ryan Uber cc613a90fd agent: test services are in sync when added from the API 2014-10-17 17:33:27 -07:00