Commit graph

2179 commits

Author SHA1 Message Date
Ryan Breen 559084724a Manually specify anchors for each LI in options.html. This is necessary because the middleman-hashicorp logic only inserts anchors if the body of the LI contains no links. For consistent presentation, we need to specify all anchors rather than relying on middleman. 2015-02-24 12:30:17 -05:00
Ryan Breen d468d4a0c4 Merge branch 'master' of github.com:hashicorp/consul into GH-730 2015-02-23 20:56:57 -05:00
Armon Dadgar 1052d98f53 website: Force deploy (newline) 2015-02-23 16:56:42 -08:00
Ryan Breen d205512336 Website: /docs/agent/options Fix internal links in options.html to match the anchors created by middleman-hashicorp. 2015-02-23 15:34:46 -05:00
Ryan Uber e04d28c98b Merge pull request #732 from hashicorp/f-merge-err
consul: allow returning custom error for merge delegate
2015-02-23 12:17:56 -08:00
Ryan Breen 3f17f30691 Merge branch 'master' of github.com:hashicorp/consul 2015-02-23 14:45:00 -05:00
Ryan Breen 8ff0368aa4 Website: docs/agent/options.html Fix config-file reference. 2015-02-23 14:44:31 -05:00
Ryan Uber 9441b46116 Merge pull request #723 from hashicorp/f-agent-block
Block until service/check sync is attempted from /v1/agent API's
2015-02-23 10:56:41 -08:00
Ryan Uber bb85d6f331 website: document -recursor arg for agent cli 2015-02-23 10:43:15 -08:00
Ryan Uber b06ea953d4 website: update middleman-hashicorp 2015-02-23 10:20:31 -08:00
Ryan Uber f7d1397bba command: clarify -recursor agent arg 2015-02-23 09:33:45 -08:00
Ryan Uber 05fa4d9fc3 Merge pull request #724 from zoli/master
Support multiple recursor flag
2015-02-23 09:27:25 -08:00
Ryan Breen 69cc331a52 Website: Cleanup for docs/guides/bootstrapping 2015-02-22 23:19:11 -05:00
Ryan Uber 275d99e1dc consul: allow returning custom error for merge delegate 2015-02-22 18:24:10 -08:00
Ryan Breen 3688432a08 Merge pull request #726 from ryanbreen/atlas
Website: cleanup for docs/guides/atlas.
2015-02-21 17:58:01 -05:00
Ryan Breen 29e09ac184 Website: cleanup for docs/guides/atlas. 2015-02-21 17:39:52 -05:00
Mohammad Zolfaghari fec46d0559 Support multiple recursor flag 2015-02-21 10:15:52 +03:30
Ryan Uber 4f4b4b0f3e agent: write API's on /v1/agent block for anti-entropy 2015-02-20 19:43:33 -08:00
Ryan Uber 92794ded6e agent: fix test compilation 2015-02-20 18:17:12 -08:00
Ryan Breen c15029dc30 Merge pull request #722 from ryanbreen/checks
Website: cleanup for getting-started/checks
2015-02-20 18:35:31 -05:00
Ryan Breen 65c23a5f4f Website: finalize cleanup for intro/getting-started/checks. 2015-02-20 18:16:31 -05:00
Ryan Breen 5ecf003adc Website: cleanup for intro/getting-started/checks. 2015-02-20 18:10:58 -05:00
Ryan Uber a9f23a9154 agent: Better warning for keyring with -encrypt option. Fixes #718. 2015-02-19 18:51:42 -08:00
Ryan Breen f08d305406 Merge pull request #715 from ryanbreen/datacenter
s/data center/datacenter/g
2015-02-19 17:50:10 -05:00
Ryan Breen 53afd77e2d s/data center/datacenter/g 2015-02-19 17:45:47 -05:00
Ryan Breen bdd694fcdf Merge pull request #713 from ryanbreen/agent
Website: cleanup for getting-started/agent
2015-02-19 17:40:25 -05:00
Ryan Breen 0730e0dfe4 Website: revert changes to 'data center' from 'datacenter' 2015-02-19 17:32:31 -05:00
Ryan Breen 61202c78ac Website: finalize cleanup for getting-started/agent.html. 2015-02-19 17:18:58 -05:00
Ryan Breen def6d4d106 Website: cleanup for getting-started/agent.html. 2015-02-19 17:12:56 -05:00
Armon Dadgar fe150743eb website: Fixing image link 2015-02-19 13:24:13 -08:00
Armon Dadgar 30607a97d2 Cut v0.5.0 2015-02-19 12:01:13 -08:00
Armon Dadgar 6cf05b0aa5 Update Vagrantfile 2015-02-19 11:58:54 -08:00
Jack Pearkes 96f1077d9d ui: fix listener on dc controller content
fixes #694
2015-02-19 11:48:03 -08:00
Armon Dadgar ab18b0fc32 website: Upgrading 0.5 docs 2015-02-19 11:03:02 -08:00
Armon Dadgar 65d4944dc4 website: Added missing link 2015-02-19 10:46:13 -08:00
Armon Dadgar 7316b5be32 Merge pull request #711 from hashicorp/f-scada
Add support for SCADA for Atlas Integration
2015-02-18 16:54:50 -08:00
Armon Dadgar d6e76e5dd4 agent: Cleanup a comment 2015-02-18 16:54:44 -08:00
Armon Dadgar 6f48e58014 api: Refactoring into shared write logic 2015-02-18 15:15:02 -08:00
Armon Dadgar 69d8b46fa5 api: Refactoring into shared query logic 2015-02-18 15:15:02 -08:00
Armon Dadgar aadec620ff agent: Fixing blocking queries on internal endpoints 2015-02-18 15:15:02 -08:00
Armon Dadgar a446fbd098 agent: Enable UI endpoints for SCADA 2015-02-18 15:15:02 -08:00
Armon Dadgar 760bbd14a5 agent: Do not expose AtlasToken or AtlasACLToken 2015-02-18 15:15:02 -08:00
Armon Dadgar 1738a6b171 agent: Updating for new client API 2015-02-18 15:15:02 -08:00
Armon Dadgar bdfc691102 website: FAQ cleanup 2015-02-18 15:15:01 -08:00
Armon Dadgar 52bdbdade9 website: Adding Atlas docs 2015-02-18 15:15:01 -08:00
Armon Dadgar 441b940280 website: Document new options 2015-02-18 15:15:01 -08:00
Armon Dadgar 0c2951c5f9 agent: Test ACL token resolution 2015-02-18 15:12:15 -08:00
Armon Dadgar 8fb86d14ab agent: Adding SCADA tests 2015-02-18 15:12:15 -08:00
Armon Dadgar 6ee6f67695 agent: Use AtlasACLToken 2015-02-18 15:12:15 -08:00
Armon Dadgar 7ddf87eb54 agent: Rename AtlasCluster to AtlasInfrastructure 2015-02-18 15:12:15 -08:00