github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,191 Commits
1,701 Branches
460 Tags
695 MiB
Commit Graph

1310 Commits (ed2e700ab9ebad383a024162d85c9d45eb51b3fc)

Author SHA1 Message Date
James Phillips 6c2462e309 Merge pull request #2611 from amiryal/patch-1 
Correct heading level in encryption documentation
 2017-01-05 12:13:13 -08:00
James Phillips 4cb00746fb Merge pull request #2615 from ruslansennov/master 
update `/v1/agent/service/register` endpoint doc
 2017-01-05 12:08:50 -08:00
James Phillips ffaef1dfc9 Merge pull request #2627 from legendtkl/master 
fix typo Check-And_set to Check-And-Set
 2017-01-05 11:55:02 -08:00
James Phillips 63ad16fe02 Merge pull request #2628 from jippi/patch-1 
Adding hashi-ui to community tools
 2017-01-05 11:51:21 -08:00
James Phillips 06e1e525e0 Merge pull request #2629 from Ashald/f-website/add-consul-announcer 
Add consul-announcer to Community Tools
 2017-01-05 11:50:48 -08:00
James Nugent d4e8c8a2c1 cli: Add KV `export` and `import` 
This commit adds two new commands to the Consul KV CLI, which export and
import a JSON formatted representation of the Consul KV tree. It is
useful to migrate parts of the KV tree between unrelated Consul
clusters, and could also be used for initial data population of the KV
store.
 2017-01-05 07:57:38 -06:00
James Nugent 2e8f440ac7 cli: Add -base64 option to `consul kv put` 
This commit adds a -base64 option to the consul kv put command, which
base 64 decodeds the data prior to writing it. This can be used in
conjunction with `consul kv get -base64 key`.
 2017-01-04 16:12:21 -06:00
James Nugent 5334649355 Merge pull request #2631 from hashicorp/kv-get-base64 
cli: Add -base64 option to `consul kv get`
 2017-01-04 16:00:27 -06:00
James Nugent b79296ac70 cli: Add -base64 option to `consul kv get` 
This commit adds a `-base64` option to the `consul kv get` command,
which base 64 encodes the output such that it can be processed by
terminal tools in the event that the data is binary. The flag defaults
to false.
 2017-01-04 15:41:40 -06:00
Borys Pierov d98f847919 Add consul-announcer to Community Tools 2017-01-04 11:03:19 -05:00
Christian Winther 62f2e493be Update downloads_tools.html.erb 2017-01-03 21:14:39 +01:00
legendtkl 713bf8654a fix typo Check-And_set to Check-And-Set 2017-01-04 00:46:16 +08:00
Ruslan Sennov 8e86ebd9db update `/v1/agent/service/register` endpoint doc 2016-12-26 23:32:20 +03:00
Amir Yalon 2932648c05 Correct heading level in encryption documentation 
The ‘RPC Encryption’ heading is semantically at the same level as ‘Gossip Encryption’.
 2016-12-22 10:51:20 +02:00
James Phillips dc2a54a77b
Updates downloads page link to 0.7.2. 2016-12-21 05:20:54 -08:00
Bradley Falzon 5a0b824ae0 Fix typo in command/kv/put doc 2016-12-21 14:02:26 +10:30
James Phillips 4956a66638 Adds session policy example to ACL internals doc. 2016-12-14 21:31:59 -08:00
James Phillips 03a4b09c1d
Fixes a typo in the agent options docs. 2016-12-14 21:03:16 -08:00
James Phillips a67d308175 Merge pull request #2594 from hashicorp/acl-complete 
Adds complete ACL support for /v1/agent endpoints.
 2016-12-14 20:49:00 -08:00
James Phillips 3a44d46126
Adds some basic documentation about the new ACL changes. 2016-12-14 20:32:44 -08:00
Kyle Havlovitz 7f5f1fed81
Add a notice about deprecation of atlas features 2016-12-14 15:13:51 -05:00
James Phillips ca7a243b70
Adds ACL management support to the agent. 2016-12-14 07:07:41 -08:00
James Phillips 0139bbb963
Adds support for a new "acl_agent_token" which is used for internal 
catalog operations.
 2016-12-12 14:52:27 -08:00
James Phillips 8aef91473f Merge pull request #2590 from hashicorp/acl-complete-catalog 
Adds new node ACL policy and applies it to catalog endpoints.
 2016-12-12 14:52:10 -08:00
James Phillips 17db4a5722 Merge pull request #2575 from bradleyfalzon/patch-1 
Link to consensus.html#deployment-table not #toc_4
 2016-12-08 14:02:52 -08:00
Seth Vargo bdb318a3ef
Switch to KV CLI in getting started 2016-12-07 14:01:51 -08:00
Seth Vargo 2beb18c0ab
Update homepage to use KV CLI instead of curl 2016-12-07 11:32:35 -08:00
Chris Marchesi 6500d1afaa command/agent: Google Compute Engine host discovery 
This commit adds several command-line and config options that facilitate
host discovery through Google Compute Engine (GCE), much like the
recently added EC2 host discovery options. This should assist with
bootstrapping and joining servers within GCE when non-static addresses
are used, such as when using managed instance groups.

Documentation has also been added. It should be noted that if running
from within a GCE instance, the only option that should be necessary is
-retry-join-gce-tag-value.
 2016-12-06 17:46:40 -08:00
Brian Shumate 92cf10a8c7
Overlooked saving a couple changes 2016-12-06 18:01:43 -05:00
Brian Shumate 418c76d8bb
updates based on feedback 2016-12-06 14:46:26 -05:00
Brian Shumate 9570120749
Address feedback 2016-12-06 14:12:05 -05:00
James Phillips 8ae9e17dff
Adds an opt-in for new ACL policies and features coming in Consul 0.8. 2016-12-06 11:06:14 -08:00
Bradley Falzon 839fdc64b3 Link to consensus.html#deployment-table not #toc_4 2016-12-06 15:40:40 +10:30
James Phillips fba22f997e
Fixes broken link in options doc. 2016-12-05 18:53:51 -08:00
James Phillips a3dc0965a8 Clarifies ACL replication token. 2016-12-05 18:43:05 -08:00
Brian Shumate 291ea643d2
Some examples where sockets are possible as well 2016-12-05 16:56:31 -05:00
Brian Shumate fbd074b7e7
Add a table of CLI environment variables 2016-12-05 12:35:44 -05:00
Brian Shumate cb33bcbeb8
Notes about memory usage (helps with #2535) 2016-12-05 12:28:49 -05:00
shantanugadgil f8febd94b8 Update kv.html.markdown 2016-12-03 13:35:55 +05:30
Mike Zupan fc352d7a62 Needs to be moved 
This took 2 hours from my life. The near has to be inside a service and not in the main block.
 2016-12-01 22:47:02 -08:00
William Lord 4d1f56a287 Update snapshot.html.markdown 2016-12-01 10:11:35 +00:00
James Phillips c07bdb173b Merge pull request #2555 from hashicorp/pr-2497-slackpad 
Updates Circonus library and adds support for custom display name and tags.
 2016-11-30 21:42:01 -08:00
James Phillips 859dbfd72a
Changes Consul version number for new Circonus options. 2016-11-30 21:35:54 -08:00
Kyle Havlovitz bd69c6d871 Add reload/leave http endpoints (#2516) 2016-11-30 13:29:42 -05:00
Brian Shumate cd75445dd5
Update compatibility table for #2540 2016-11-30 11:17:52 -05:00
James Phillips 2dea48193c Merge pull request #2532 from jamtur01/docspass 
Documentation pass
 2016-11-29 15:15:04 -08:00
James Phillips 214fbbbad2 Update dns.html.markdown 2016-11-29 15:01:38 -08:00
anatoly 53d4f0f51c [website]: Clojure client to SDK 
in the "Download Consul Tools" list
 2016-11-29 02:12:14 -05:00
Kyle Havlovitz 124f907063 Add monitor http endpoint 2016-11-28 18:36:26 -05:00
James Turnbull 8d29224d5c Fix to watch command docs 2016-11-25 13:34:08 -05:00
James Turnbull db13340633 Final dc pass 2016-11-25 13:29:55 -05:00
James Turnbull 8a145d50a3 Removed two space after period exceptions 2016-11-25 13:25:09 -05:00
James Turnbull edeb7e405a Another catch 2016-11-25 13:14:09 -05:00
James Turnbull 90a83d1329 And a handful more 2016-11-25 12:39:08 -05:00
James Turnbull 9e5184fca3 More consistency 2016-11-25 12:34:07 -05:00
James Turnbull 23a4a96ad3 Documentation pass 
I was reviewing some docs and found a few issues.

1. Fixed some spelling mistakes.
2. Re-formatted some paragraphs.
3. Changed some potentially loaded language.
4. Fixed some grammar issues.
5. Tried to consistently use syntax-highlighting.
6. Fixed post-period spacing.
7. Fixed some formatting issues and inconsistency.
8. All "notes" are either proper notes or re-written.
 2016-11-25 12:02:32 -05:00
Kyle Havlovitz dcdadd012f Fix keyring doc method wording 2016-11-22 20:10:43 -05:00
Kyle Havlovitz 6bd65c668b Combine keyring endpoints into one 2016-11-22 20:10:43 -05:00
Kyle Havlovitz 31453c7dbd Add version specific note to keyring http docs 2016-11-22 20:10:43 -05:00
Kyle Havlovitz 345e2366eb Add keyring api website doc sections 2016-11-22 20:10:43 -05:00
James Phillips 4ed6770cfa Makes addresses blank in service definition. 2016-11-22 08:29:29 -08:00
James Phillips ea58d6795d Tweaks title of snapshot link. 2016-11-21 09:02:19 -08:00
James Phillips fb27534dc1 Merge pull request #2515 from hashicorp/f-snapshot-agent-docs 
Adds a draft of the snapshot agent docs.
 2016-11-20 22:42:22 -08:00
James Phillips 66b61e68a0
Adds details about config files. 2016-11-20 22:41:33 -08:00
James Phillips 3a63638cd7
Tweaks local option name. 2016-11-19 18:23:37 -08:00
Brian Shumate 940232890e
tweaks 2016-11-18 10:53:59 -05:00
Brian Shumate 3871c4810e
Attempt to describe entire response (for #2393) 
Describe fields returned by /v1/catalog/service/<service>
 2016-11-18 10:33:37 -05:00
James Phillips dabb08de51 Merge pull request #2504 from tolitius/envoy 
[website]: adding a Clojure client
 2016-11-17 16:56:38 -08:00
James Phillips 5ce301d322 Merge pull request #2501 from Drawaes/master 
[Website] Update community tools page to add condenserdotnet
 2016-11-17 16:55:39 -08:00
James Phillips 695c128f1b Tweaks markup on community page. 2016-11-17 16:55:27 -08:00
James Phillips 70ad430fd2 Merge pull request #2397 from sdinakar85/patch-1 
Multiple Datacenter Documentation
 2016-11-17 16:43:55 -08:00
James Phillips 5f796f8128 Tweaks formatting of example JSON. 2016-11-17 16:43:47 -08:00
James Phillips e1e43dec7a
Adds a draft of the snapshot agent docs. 2016-11-16 21:38:02 -08:00
Cameron Stokes 74cfcd3014 ~ docs: Typo in agent options page. 2016-11-16 07:58:24 -08:00
Benjamin Farley 58fa50e06d Small change to how operator docs read 2016-11-16 09:01:51 +00:00
Brian Shumate df51fde7b0 Docs: Web UI config updates (#2411) 
* Updates around Web UI directory configuration

* consistent terms
 2016-11-12 13:08:15 -08:00
anatoly a0f87c742c [website]: adding a Clojure client 
to the "Download Consul Tools" list
 2016-11-10 22:02:00 -05:00
Tim Seaward 451f850ab1 Update downloads_tools.html.erb 
Added condenserdotnet
 2016-11-10 22:29:44 +00:00
James Phillips a819fd0e83 Update upgrade-specific.html.markdown 2016-11-10 13:38:36 -08:00
James Phillips ffc05ace69 Update dns-cache.html.markdown 2016-11-10 13:37:44 -08:00
James Phillips 10d4e1ff54
Points web at 0.7.1 release. 2016-11-10 12:54:10 -08:00
Brian Shumate 486fa06eec Updated broken Extended Key Usage link (#2500) 2016-11-10 08:09:39 -08:00
Sumit Gupta 2f97f65ed9 Remove Extra > (#2499) 2016-11-10 08:09:17 -08:00
James Phillips 16f8e04bfe
Revert "Updates Circonus metrics library and adds support for display name and tags." 
This reverts commit bd490ec937 from #2491.
 2016-11-09 16:21:02 -08:00
matt maier bd490ec937 Updates Circonus metrics library and adds support for display name and tags. 
* Update circonus-gometrics

`vendor circonus-labs/circonus-gometrics`
`vendor circonus-labs/circonus-gometrics/api`
`vendor circonus-labs/circonus-gometrics/checkmgr`
`vendor circonus-labs/circonusllhist`
`vendor hashicorp/go-retryablehttp`

* Update Circonus integration expose Check Display Name and Check Tags configuration options.

* Adds version info to docs for new Circonus options.
 2016-11-09 13:26:43 -08:00
James Phillips 08448015b1 Adds version info to docs for new Circonus options. 2016-11-09 13:26:20 -08:00
matt maier 91a8b43d5a Update Circonus integration expose Check Display Name and Check Tags configuration options. 2016-11-09 15:33:37 -05:00
James Phillips a61252b324 Update upgrade-specific.html.markdown 2016-11-08 12:12:57 -08:00
Kyle Havlovitz 8e621eb9c8 Set MaxStale default to 10 years and add a stale counter (#2481) 
Default MaxStale to 10 years and add a counter at `consul.dns.stale_queries` that tracks when an agent serves a query that's stale by at least 5 seconds. Previously, MaxStale defaulted to 5 seconds and DNS would become unavailable after a short period of time with no leader. This new default allows DNS requests to still be served in the event of a long outage.

Fixes #2460.
 2016-11-08 14:45:12 -05:00
Cameron Stokes e6e35d9013 Clarify -retry-join docs. (#2469) 2016-11-03 14:22:46 -07:00
Kyle McCullough 73b281a27c Add setting to skip ssl certificate verification for HTTP checks (#1984) 
* http check: add setting to skip ssl certificate verification

* update http check documentation

* fix typo in documentation

* Add TLSSkipVerify to agent api
 2016-11-03 13:17:30 -07:00
James Phillips 233a3a101b Supports WAN and LAN Serf Bind Addresses. (#2468) 
* * adding cli config and config file support for specifying the serf wan and lan bind addresses
* updating documentation for serf wan and lan options
Fixes #2007

* Cleans up some small things from #2380.

* Uses the bind default for the agent test for Serf WAN and LAN.
 2016-11-03 12:58:58 -07:00
Kyle Havlovitz 1de39d23d1
Small tweaks to docs and syntax 2016-11-03 13:04:42 -04:00
Kyle Havlovitz f3efab5f84
Add support for ECS task roles as an auth mechanism 2016-11-02 18:48:15 -04:00
Kyle Havlovitz d4d6e2b482
Move EC2 discovery logic into retryJoin for robustness 2016-11-02 14:35:37 -04:00
Ustun Ozgur fb7c03cbb1 Typo fix (#2457) 2016-11-01 06:11:20 -07:00
Kyle Havlovitz 606662c502 Add snapshot inspect subcommand (#2451) 2016-10-31 19:37:27 -04:00
Kyle Havlovitz 4be39290e5 Revert "Added website docs for snapshot inspect command" 
This reverts commit 7d0318252c.
 2016-10-31 17:06:47 -04:00
Kyle Havlovitz 7d0318252c
Added website docs for snapshot inspect command 2016-10-31 17:01:27 -04:00
Seth Vargo d5aac284d9 Switch to Docker-based website build process (#2448) 
This has been working really well on Nomad and hashicorp.com, so I am
ready to port it out to Consul as a beta. This moves the local
development to a Docker container, which is the same container that we
use to publish the website in production. The result is much faster and
more consistent deploys.
 2016-10-31 12:49:52 -07:00
Kyle Havlovitz 3be132863f Enable snapshots in dev mode (#2453) 2016-10-31 14:39:47 -04:00
Seth Vargo bfa0c3bc4c Add security page (#2447) 2016-10-29 12:44:20 -07:00
Rick van de Loo 757a45ed7f Add Python 3 KV store client to community tools (#2431) 2016-10-26 17:15:24 -07:00
James Phillips c01a3871c9 Adds support for snapshots and restores. (#2396) 
* Updates Raft library to get new snapshot/restore API.

* Basic backup and restore working, but need some cleanup.

* Breaks out a snapshot module and adds a SHA256 integrity check.

* Adds snapshot ACL and fills in some missing comments.

* Require a consistent read for snapshots.

* Make sure snapshot works if ACLs aren't enabled.

* Adds a bit of package documentation.

* Returns an empty response from restore to avoid EOF errors.

* Adds API client support for snapshots.

* Makes internal file names match on-disk file snapshots.

* Adds DC and token coverage for snapshot API test.

* Adds missing documentation.

* Adds a unit test for the snapshot client endpoint.

* Moves the connection pool out of the client for easier testing.

* Fixes an incidental issue in the prepared query unit test.

I realized I had two servers in bootstrap mode so this wasn't a good setup.

* Adds a half close to the TCP stream and fixes panic on error.

* Adds client and endpoint tests for snapshots.

* Moves the pool back into the snapshot RPC client.

* Adds a TLS test and fixes half-closes for TLS connections.

* Tweaks some comments.

* Adds a low-level snapshot test.

This is independent of Consul so we can pull this out into a library
later if we want to.

* Cleans up snapshot and archive and completes archive tests.

* Sends a clear error for snapshot operations in dev mode.

Snapshots require the Raft snapshots to be readable, which isn't supported
in dev mode. Send a clear error instead of a deep-down Raft one.

* Adds docs for the snapshot endpoint.

* Adds a stale mode and index feedback for snapshot saves.

This gives folks a way to extract data even if the cluster has no
leader.

* Changes the internal format of a snapshot from zip to tgz.

* Pulls in Raft fix to cancel inflight before a restore.

* Pulls in new Raft restore interface.

* Adds metadata to snapshot saves and a verify function.

* Adds basic save and restore snapshot CLI commands.

* Gets rid of tarball extensions and adds restore message.

* Fixes an incidental bad link in the KV docs.

* Adds documentation for the snapshot CLI commands.

* Scuttle any request body when a snapshot is saved.

* Fixes archive unit test error message check.

* Allows for nil output writers in snapshot RPC handlers.

* Renames hash list Decode to DecodeAndVerify.

* Closes the client connection for snapshot ops.

* Lowers timeout for restore ops.

* Updates Raft vendor to get new Restore signature and integrates with Consul.

* Bounces the leader's internal state when we do a restore.
 2016-10-25 19:20:24 -07:00
James Phillips 104b12040a Merge pull request #2383 from hashicorp/jbs-1462 
Clarify retry_join addresses for #1462
 2016-10-20 11:40:03 -07:00
Brian Shumate 17dfb0b196
Reworded and applied to -retry-join also 2016-10-20 14:14:55 -04:00
James Phillips fa8cd7f833 Merge pull request #2381 from bluefeet/master 
Add the Perl Consul client library to the list of SDKs on the web site.
 2016-10-20 09:39:39 -07:00
James Phillips 41f1764434 Adds a version note for the consul kv command. 
Closes #2410.
 2016-10-13 08:02:20 -07:00
Michel Lebeau 2397c75856 Fix typo 
The double "to" was distracting
 2016-10-11 15:51:49 +01:00
sdinakar85 bb08378059 Multiple Datacenter Documentation 
Updated the slightly confusing documentation on how to join the clusters over WAN. Also the inputs from #1656 is taken in account in this documentation update.
 2016-10-07 14:12:37 +05:30
James Phillips b073ec72f3 Adds a note about child process reaping going away. 2016-10-06 21:38:29 -07:00
James Phillips 55a00d4d1b Update community.html.erb 2016-10-06 17:38:34 -07:00
Adrián López Gómez e25efedcc2 Doc fix - allow_stale enabled by default in v0.7 2016-10-06 15:00:28 +02:00
Andreas Böttger cb8deabdc3 json syntax corrected 2016-10-04 15:40:53 +02:00
Brian Shumate 320b07c025
Clarify retry_join addresses for #1462 
- Initial pass at adding note about address formats for retry_join;
  IPv4 is a list of IPs only, whereas IPv6 are bracketed IPs + port
 2016-10-03 12:15:24 -04:00
Aran Deltac 28277d35e7 Add the Perl Consul client library to the list of SDKs on the web site. 2016-10-01 17:52:45 -07:00
James Phillips 9fc0c0ede2 Merge pull request #2369 from hashicorp/jbs-2204 
Update getting started/join to address #2204
 2016-09-30 07:51:30 -07:00
Brian Shumate ba5bbf8ca2
Update variable value information as port must also be specified, fixes #2210 2016-09-29 12:50:00 -04:00
Brian Shumate d8080c27d5
correction 2016-09-29 12:42:22 -04:00
Brian Shumate 38e45f9641
Update getting started/join to address #2204 2016-09-28 12:20:36 -04:00
Brian Shumate 775c32539f
Finalize update for -bind 2016-09-27 18:36:19 -04:00
Brian Shumate 59a90d68a9
Clarification 2016-09-27 12:38:32 -04:00
Brian Shumate 49a410a2da
Correct inaccurate bind reference, closes #2234 2016-09-27 12:05:22 -04:00
James Phillips 4dc526afed Merge pull request #2362 from mckennajones/cliflagformatting 
Making CLI flag formatting consistent in the docs
 2016-09-27 07:51:56 -07:00
James Phillips 1e318db830 Update operator.html.markdown 2016-09-27 06:25:51 -07:00
McKenna Jones 34043357da cli flag formatting for agent docs and one guide 2016-09-26 21:22:01 -07:00
McKenna Jones 865e9ea5c3 updating cli formatting for intro docs 2016-09-26 19:28:39 -07:00
Seth Vargo f381d19221
Update cas docs 2016-09-26 16:15:27 -07:00
Seth Vargo 28de64c7f0
Remove base64 comment entirely 2016-09-26 16:10:22 -07:00
Seth Vargo 39fb70ff67
Fix CAS operations for put 2016-09-26 16:06:56 -07:00
Seth Vargo 85350a4329
Update kv get docs 2016-09-26 16:06:56 -07:00
Seth Vargo c7496c5652
Change delete CAS behavior to require ModifyIndex 2016-09-26 16:06:55 -07:00
Seth Vargo b3c280772f
Gemfile was wonky 2016-09-26 16:06:54 -07:00
Seth Vargo de7fc2c7ac
Fix styles 2016-09-26 16:06:54 -07:00
Seth Vargo a6262c863b
Add top-level docs command 2016-09-26 16:06:54 -07:00
Seth Vargo 297a22383f
Add kv delete command 2016-09-26 16:06:53 -07:00
Seth Vargo 82bddd7f9b
Add kv put command 2016-09-26 16:06:53 -07:00
Seth Vargo c8fdc5c50d
Add kv get 2016-09-26 16:06:53 -07:00
Seth Vargo afd0e58c24
Update middleman 2016-09-26 16:06:52 -07:00
JF Bibeau ee008bcc2d Docs: Update command to create sample service 
Since the previous command creates /etc/consul.d with sudo, a regular user won't have permission to echo and redirect a file to the directory. Switch to using tee with sudo to ensure the file gets created.
 2016-09-26 16:36:10 -04:00
James Phillips cfa66a62ab
Updates middleman-hashicorp. 2016-09-23 16:13:12 -07:00
James Phillips c4c409be44 Update keyring.html.markdown 2016-09-23 16:00:05 -07:00
Seth Vargo e1c8b14a6b
Clarify that hostname defaults to localhost for tcp 2016-09-21 12:20:36 -04:00
Brian Shumate 2c9501a1b0
Remove references to the 'unknown' state. 
- Remove reference to 'unknown' state in catalog endpoint docs
- Remove reference to 'unknown' state in health endpoint docs
 2016-09-21 09:50:12 -04:00
James Phillips b2e867454a Updates getting started to remove broken links. 
Fixes #2293.
 2016-09-16 15:58:01 -07:00
James Phillips 6f0a3b9bf5 Adds Operator endpoint link. 2016-09-15 13:13:09 -07:00
Brian Shumate 1ee4ba2db6
Restore command line. 2016-09-15 10:37:08 -04:00
Brian Shumate 1654de6184
Command output updates. 
- Updated starting agent example to show new output/timestamps
- Updated curl example to show TaggedAddresses
- Updated dig example to return 127.0.0.1
 2016-09-15 10:25:23 -04:00
James Phillips f57b84b807 Tweaks wording in lifeguard section. 2016-09-14 10:17:23 -07:00
James Phillips c591d86dd5
Adds a section about lifeguard. 2016-09-14 10:09:23 -07:00