status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,376 Commits 445 Branches 179 Tags 481 MiB
Commit Graph

2376 Commits

Author SHA1 Message Date
Ryan Breen 26ec7ca600 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 69a8de36c0 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 a5b5eff31c Merge branch 'master' of github.com:hashicorp/consul 2015-02-23 14:45:00 -05:00
Ryan Breen 16600d498e Website: docs/agent/options.html Fix config-file reference. 2015-02-23 14:44:31 -05:00
Ryan Uber bd14b90861 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 2c3995b8c5 website: document -recursor arg for agent cli 2015-02-23 10:43:15 -08:00
Ryan Uber 7c5056df34 website: update middleman-hashicorp 2015-02-23 10:20:31 -08:00
Ryan Uber 84f04ff4c9 command: clarify -recursor agent arg 2015-02-23 09:33:45 -08:00
Ryan Uber e98b0edab4 Merge pull request #724 from zoli/master 
Support multiple recursor flag
 2015-02-23 09:27:25 -08:00
Ryan Breen d89a44d71d Website: Cleanup for docs/guides/bootstrapping 2015-02-22 23:19:11 -05:00
Ryan Uber 1200e25ec9 consul: allow returning custom error for merge delegate 2015-02-22 18:24:10 -08:00
Ryan Breen bc331fb0c6 Merge pull request #726 from ryanbreen/atlas 
Website: cleanup for docs/guides/atlas.
 2015-02-21 17:58:01 -05:00
Ryan Breen fcdce608d8 Website: cleanup for docs/guides/atlas. 2015-02-21 17:39:52 -05:00
Mohammad Zolfaghari f067ad873b Support multiple recursor flag 2015-02-21 10:15:52 +03:30
Ryan Uber 6ce6d2d806 agent: write API's on /v1/agent block for anti-entropy 2015-02-20 19:43:33 -08:00
Ryan Uber 6f0fecc73c agent: fix test compilation 2015-02-20 18:17:12 -08:00
Ryan Breen ebebdd1c1e Merge pull request #722 from ryanbreen/checks 
Website: cleanup for getting-started/checks
 2015-02-20 18:35:31 -05:00
Ryan Breen 799a1886f3 Website: finalize cleanup for intro/getting-started/checks. 2015-02-20 18:16:31 -05:00
Ryan Breen 139b7303ee Website: cleanup for intro/getting-started/checks. 2015-02-20 18:10:58 -05:00
Ryan Uber 4193525931 agent: Better warning for keyring with -encrypt option. Fixes #718. 2015-02-19 18:51:42 -08:00
Ryan Breen be8b14979e Merge pull request #715 from ryanbreen/datacenter 
s/data center/datacenter/g
 2015-02-19 17:50:10 -05:00
Ryan Breen b78eb40ef4 s/data center/datacenter/g 2015-02-19 17:45:47 -05:00
Ryan Breen af68f687f2 Merge pull request #713 from ryanbreen/agent 
Website: cleanup for getting-started/agent
 2015-02-19 17:40:25 -05:00
Ryan Breen 92e193161f Website: revert changes to 'data center' from 'datacenter' 2015-02-19 17:32:31 -05:00
Ryan Breen f47b70e7bb Website: finalize cleanup for getting-started/agent.html. 2015-02-19 17:18:58 -05:00
Ryan Breen 9aaf9cb6c4 Website: cleanup for getting-started/agent.html. 2015-02-19 17:12:56 -05:00
Armon Dadgar 456c3ca052 website: Fixing image link 2015-02-19 13:24:13 -08:00
Armon Dadgar 0c7ca91c74 Cut v0.5.0 2015-02-19 12:01:13 -08:00
Armon Dadgar 553908765b Update Vagrantfile 2015-02-19 11:58:54 -08:00
Jack Pearkes 2b7297c81d ui: fix listener on dc controller content 
fixes #694
 2015-02-19 11:48:03 -08:00
Armon Dadgar d9121a8d89 website: Upgrading 0.5 docs 2015-02-19 11:03:02 -08:00
Armon Dadgar b15dbaee16 website: Added missing link 2015-02-19 10:46:13 -08:00
Armon Dadgar fa7d803da8 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 cd3cd4d3b8 agent: Cleanup a comment 2015-02-18 16:54:44 -08:00
Armon Dadgar 5f627fca1b api: Refactoring into shared write logic 2015-02-18 15:15:02 -08:00
Armon Dadgar c0c9fb58ce api: Refactoring into shared query logic 2015-02-18 15:15:02 -08:00
Armon Dadgar 0101ee38eb agent: Fixing blocking queries on internal endpoints 2015-02-18 15:15:02 -08:00
Armon Dadgar 847eaadc56 agent: Enable UI endpoints for SCADA 2015-02-18 15:15:02 -08:00
Armon Dadgar 62c3d49d64 agent: Do not expose AtlasToken or AtlasACLToken 2015-02-18 15:15:02 -08:00
Armon Dadgar ea42b04593 agent: Updating for new client API 2015-02-18 15:15:02 -08:00
Armon Dadgar 08610b03fe website: FAQ cleanup 2015-02-18 15:15:01 -08:00
Armon Dadgar 05ac51ca26 website: Adding Atlas docs 2015-02-18 15:15:01 -08:00
Armon Dadgar c650deb076 website: Document new options 2015-02-18 15:15:01 -08:00
Armon Dadgar ad3016100c agent: Test ACL token resolution 2015-02-18 15:12:15 -08:00
Armon Dadgar 8fb642d332 agent: Adding SCADA tests 2015-02-18 15:12:15 -08:00
Armon Dadgar c495a5434d agent: Use AtlasACLToken 2015-02-18 15:12:15 -08:00
Armon Dadgar 8d184a241f agent: Rename AtlasCluster to AtlasInfrastructure 2015-02-18 15:12:15 -08:00
Armon Dadgar b9cdb94f19 agent: Fixing setup of SCADA HTTP listener 2015-02-18 15:12:15 -08:00
Armon Dadgar 6a640604dd agent: Fixing panic on shutdown 2015-02-18 15:12:15 -08:00
Armon Dadgar e99f9dd070 agent: Provide auto-join metadata to SCADA 2015-02-18 15:12:14 -08:00