Commit Graph

1459 Commits

Author SHA1 Message Date
Ryan Uber 9164477de9 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 ad4598959e 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 df43c42c94 website: Fixing formatting 2014-10-23 17:14:40 -07:00
Armon Dadgar 2b2f9980fb 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 d83053e8ab website: document retry_join and retry_interval flags for config file 2014-10-23 16:40:49 -07:00
Armon Dadgar 5376404aaf Merge pull request #429 from lra/doc_fix
Small typo in the doc
2014-10-23 12:55:03 -07:00
Laurent Raufaste 9df9eb0983 Small typo in the doc 2014-10-23 14:32:11 -04:00
Mitchell Hashimoto f44abecd1d 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 d2985d3c04 Add links for status endpoints 2014-10-23 07:59:58 -04:00
Brian Lalor 3082b3f95f Add links for event endpoints 2014-10-23 07:59:05 -04:00
Brian Lalor d45fdd15dd Add links for ACL endpoints 2014-10-23 07:57:55 -04:00
Brian Lalor 39e44c7968 Add links for session endpoints 2014-10-23 07:56:28 -04:00
Brian Lalor 9a29e1b60e Add links for health endpoints 2014-10-23 07:54:46 -04:00
Brian Lalor 4401fbf0e3 Add links for catalog endpoints 2014-10-23 07:53:11 -04:00
Brian Lalor 3ecb9ec8df Add links for agent endpoints 2014-10-23 07:50:54 -04:00
Brian Lalor 4ca29beec3 Improve navigability of agent HTTP API categories 2014-10-23 07:44:20 -04:00
Leo Cassarani d43a89fdd7 Fix spelling of "separator" in the HTTP API docs 2014-10-23 12:31:41 +01:00
Seth Vargo dd72095659 Create unified "Consul Tools" page to showcase our tools and the communities 2014-10-21 18:22:53 -04:00
Seth Vargo 3ef35f75ff Fix the duplicate navigation active classes 2014-10-21 16:42:38 -04:00
Seth Vargo 22196dc47a Fix small typo in link 2014-10-21 16:38:44 -04:00
Seth Vargo b31a72e29c Fix copy-paste fail 2014-10-21 16:32:58 -04:00
Jack Pearkes 16c8f92b2b 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 e702810774 Add Consul Template to the download list 2014-10-21 16:24:00 -04:00
Armon Dadgar 92c5f17498 website: Fixing link to demo cluster 2014-10-20 13:18:24 -07:00
Armon Dadgar 820af16e9b 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 4515f82691 Bump website version 2014-10-20 10:42:06 -07:00
Armon Dadgar af90aa8026 Gofmt 2014-10-20 10:21:31 -07:00
Armon Dadgar ae9f280f2b CHANGELOG updates 2014-10-20 10:20:13 -07:00
Seth Vargo bf6840bc8a Merge pull request #412 from ErikDubbelboer/website-fix
Fix small doc mistake
2014-10-20 06:39:03 -07:00
Erik Dubbelboer 03e3599872 Fix small doc mistake 2014-10-20 06:26:38 +00:00
Seth Vargo 9c12b95cb7 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 2217f93fc6 Update gems to latest versions 2014-10-19 19:42:41 -04:00
Seth Vargo e265ea050d Use new Markdown syntaxes and add SEO descriptions 2014-10-19 19:42:13 -04:00
Seth Vargo 36a14019d1 Use a description attribute for HTML descriptions 2014-10-19 19:41:12 -04:00
Seth Vargo 26c2bf1788 Import fonts in CSS instead of HTML 2014-10-19 19:41:12 -04:00
Seth Vargo dc9295fc3f Move more javascript into the footer 2014-10-19 19:41:12 -04:00
Seth Vargo 74c981e0c6 Cleanup header HTML 2014-10-19 19:41:12 -04:00
Seth Vargo 714d1003d1 Add robots.txt and sitemap 2014-10-19 19:41:12 -04:00
Seth Vargo 700f321b9b Do not underline API doc links 2014-10-19 19:41:11 -04:00
Seth Vargo 21ab20c6b4 Remove prettify css 2014-10-19 19:41:11 -04:00
Seth Vargo e90f3ce442 Use codeblocks for code 2014-10-19 19:41:11 -04:00
Seth Vargo 35f700049c Remove highlighting javascript files 2014-10-19 19:41:11 -04:00
Seth Vargo 64633eec02 Remove unused font file 2014-10-19 19:41:11 -04:00
Mark Rushakoff c58627df41 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 32b14c6f02 CHANGELOG updates 2014-10-17 18:48:51 -07:00
Armon Dadgar 3f36515544 Switching to the pinned version of msgpack 2014-10-17 18:26:19 -07:00
Armon Dadgar 34713fe970 Encode/Decode test 2014-10-17 18:23:13 -07:00
Armon Dadgar b04dc46c72 consul: Improving test reliability 2014-10-17 17:40:14 -07:00
Ryan Uber c236900dba agent: test services are in sync when added from the API 2014-10-17 17:33:27 -07:00
Ryan Uber 6b119b98f0 agent: add test for consul service sync state 2014-10-17 14:43:52 -07:00