Commit Graph

671 Commits

Author SHA1 Message Date
Sean Chittenden c6feba6ab7 Revert "Change `ClientAddr` to default to `BindAddr` when not present." 2017-03-06 13:32:43 -08:00
Sean Chittenden 17ccae59f4
Note the default value prior to 0.8 for `-client` was `127.0.0.1`. 2017-03-06 12:26:35 -08:00
Sean Chittenden e1ced1de30
Change `ClientAddr` to default to `BindAddr` when not present.
With this change, it is now possible to only specify the `-bind` or
`bind_addr` attributes and get a functioning consul agent.
2017-03-04 20:52:52 -08:00
James Phillips 233795704c Moves raft_protocol config out into its own top-level item. 2017-03-04 09:20:23 -08:00
James Phillips aba567273e Merge pull request #2690 from zeroae/f-simple-rfc2782
RFC 2782 support with optional .service tag
2017-03-02 14:49:36 -08:00
Kyle Havlovitz 44f0b08db7 Merge pull request #2771 from hashicorp/f-autopilot
Autopilot dead server cleanup, config, and raft version compatibility
2017-02-28 15:04:16 -08:00
Kyle Havlovitz 23c492a74e
Rename DeadServerCleanup and make wording adjustments 2017-02-28 14:45:21 -08:00
Kyle Havlovitz 3b67c50c1d
Remove the RPC client interface and update docs 2017-02-28 13:41:09 -08:00
Kyle Havlovitz f7b6d776f4
Add cli docs and minor test/comment tweaks 2017-02-24 16:55:44 -08:00
Kyle Havlovitz 7d514a7ef6
Add docs and api client methods for autopilot config 2017-02-23 21:00:15 -08:00
Kyle Havlovitz af1bc4fa27
Add config section to docs for autopilot 2017-02-22 13:11:01 -08:00
Ellery Addington-White 17b9f3346d Adds missing double quote 2017-02-16 13:38:55 -08:00
James Phillips b88a7eee95 Adds clarifying note about the wakeup jitter.
Closes #2727.
2017-02-09 20:28:38 -08:00
James Phillips 723391b22d Removes broken WriteRequest ACL reference for catalog endpoints.
Fixes #1034.
2017-02-07 19:02:18 -08:00
Andrey Upadyshev f2b5a6439c Fix `acquire` parameter nesting 2017-02-03 00:20:35 +01:00
Kyle Havlovitz 4fc3bd3abf
Added -relay-factor param to keyring operations 2017-02-01 21:53:29 -05:00
Kyle Havlovitz f48cd78bc5 Merge pull request #2699 from hashicorp/f-tls-min-version
Add TLSMinVersion to config options
2017-02-01 16:31:53 -05:00
Kyle Havlovitz 086975ac0a
Add TLSMinVersion to config options 2017-02-01 16:20:33 -05:00
James Phillips d593771d3c Merge pull request #2692 from Toady00/patch-1
Specify PUT for agent maintenance endpoint
2017-02-01 06:58:20 -08:00
James Phillips cbaf7ee81e Merge pull request #2666 from hashicorp/sethvargo-patch-1
Say which ec2 perms to use
2017-02-01 06:57:07 -08:00
Brandon Dennis fe8e7238e5 Specify PUT for agent maintenance endpoint
Through most of the documentation if the method isn't specified it should be a `GET` request, but here it should be a `PUT`.
2017-01-31 16:00:27 -05:00
Patrick Sodré 5b68178dc1 Simple RFC 2782 support with optional .service tag
Add support for SRV queries of names matching:
_<service>._<protocol>.[.service][.datacenter]<.domain>
2017-01-30 19:46:02 -05:00
Andrey Upadyshev 0523eaf1f3 Fix missing query parameters formatting in HTTP API documentation 2017-01-25 14:34:56 +01:00
Kyle Havlovitz cc271aa436
Merge branch 'master' into f-prepared-query-nodemeta 2017-01-23 20:17:48 -05:00
Kyle Havlovitz 3cd054e81f
Add tests for node meta in prepared queries and update docs 2017-01-23 19:17:30 -05:00
Seth Vargo 222ade1f84 Say which ec2 perms to use 2017-01-20 17:13:28 -05:00
James Phillips 2e67edb2f2 Fixes a paste-o in the docs. 2017-01-18 16:02:04 -08:00
James Phillips 55cd1d975c
Adds catalog support for node IDs. 2017-01-18 14:26:42 -08:00
James Phillips 96bff003b7
Adds basic support for node IDs. 2017-01-17 22:47:59 -08:00
Mikhail Zholobov d54630ed79
website: Fix nesting for "raft_multiplier" option 2017-01-17 14:59:18 +02:00
Kyle Havlovitz 9080006a37
Add support for multiple metadata filters to remaining endpoints
Enabled multiple meta filters for /v1/catalog/nodes and /v1/catalog/services
2017-01-13 20:49:13 -05:00
Kyle Havlovitz e37f25dc02
Add node metadata filtering to remaining health/catalog endpoints 2017-01-13 20:08:43 -05:00
Kyle Havlovitz 2139dbb029
Merge branch 'master' into f-gce-discovery 2017-01-11 22:57:07 -05:00
Kyle Havlovitz 84b157eade
Condense gce discovery logging a bit 2017-01-11 22:37:22 -05:00
Kyle Havlovitz 821735d175 Merge pull request #2643 from hashicorp/f-node-metadata
Node metadata
2017-01-11 20:29:24 -05:00
Kyle Havlovitz 15f008b3e3
Update client api and docs for node metadata 2017-01-11 19:28:58 -05:00
Kyle Havlovitz 561d6c71e0
Update website docs for node metadata 2017-01-11 17:52:31 -05:00
Brian Shumate f81d8c0754
DOCS: update environment variables
- Move environment variables to section of CLI page
- Remove environment variables page
- Remove environment variables nagivation menu entry
2017-01-09 12:02:06 -05:00
Brian Shumate d5bdc4c98b
DOCS: update environment variables page
- Relocate Environment Variables page to Agent section
- Correct front matter newlines issue
2017-01-06 09:42:49 -05:00
James Phillips 5647e37ef2 Merge pull request #2611 from amiryal/patch-1
Correct heading level in encryption documentation
2017-01-05 12:13:13 -08:00
Ruslan Sennov e81502babb update `/v1/agent/service/register` endpoint doc 2016-12-26 23:32:20 +03:00
Amir Yalon 58ee61c3c7 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 fe07574220
Fixes a typo in the agent options docs. 2016-12-14 21:03:16 -08:00
James Phillips b617e54ff0 Merge pull request #2594 from hashicorp/acl-complete
Adds complete ACL support for /v1/agent endpoints.
2016-12-14 20:49:00 -08:00
Kyle Havlovitz 398f4a04ef
Add a notice about deprecation of atlas features 2016-12-14 15:13:51 -05:00
James Phillips 927aa3789a
Adds ACL management support to the agent. 2016-12-14 07:07:41 -08:00
James Phillips 67f1fe8d0b
Adds support for a new "acl_agent_token" which is used for internal
catalog operations.
2016-12-12 14:52:27 -08:00
Chris Marchesi 1b4e26d005 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
James Phillips eb07e77c1c
Adds an opt-in for new ACL policies and features coming in Consul 0.8. 2016-12-06 11:06:14 -08:00
James Phillips c5ca72c5a5
Fixes broken link in options doc. 2016-12-05 18:53:51 -08:00
Mike Zupan 492d39fbb3 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 67a84e0e20 Update snapshot.html.markdown 2016-12-01 10:11:35 +00:00
James Phillips bd5adea5ba 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 7d67346f42
Changes Consul version number for new Circonus options. 2016-11-30 21:35:54 -08:00
Kyle Havlovitz dd05afb32e Add reload/leave http endpoints (#2516) 2016-11-30 13:29:42 -05:00
James Phillips ee16675eda Merge pull request #2532 from jamtur01/docspass
Documentation pass
2016-11-29 15:15:04 -08:00
James Phillips f4f96c180d Update dns.html.markdown 2016-11-29 15:01:38 -08:00
Kyle Havlovitz d91854f3b0 Add monitor http endpoint 2016-11-28 18:36:26 -05:00
James Turnbull edd5739e90 Final dc pass 2016-11-25 13:29:55 -05:00
James Turnbull 25566a292b Removed two space after period exceptions 2016-11-25 13:25:09 -05:00
James Turnbull 39364aa937 Another catch 2016-11-25 13:14:09 -05:00
James Turnbull 38be465b7d And a handful more 2016-11-25 12:39:08 -05:00
James Turnbull 51bc365377 More consistency 2016-11-25 12:34:07 -05:00
James Turnbull dd4918fd16 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 66dea6951a Fix keyring doc method wording 2016-11-22 20:10:43 -05:00
Kyle Havlovitz 79f339b5dc Combine keyring endpoints into one 2016-11-22 20:10:43 -05:00
Kyle Havlovitz b13c9dc5d3 Add version specific note to keyring http docs 2016-11-22 20:10:43 -05:00
Kyle Havlovitz 86ae45c78b Add keyring api website doc sections 2016-11-22 20:10:43 -05:00
James Phillips 2319624f69 Makes addresses blank in service definition. 2016-11-22 08:29:29 -08:00
James Phillips a34d968aeb Tweaks title of snapshot link. 2016-11-21 09:02:19 -08:00
Brian Shumate 71e00601ec
tweaks 2016-11-18 10:53:59 -05:00
Brian Shumate e7b21b6876
Attempt to describe entire response (for #2393)
Describe fields returned by /v1/catalog/service/<service>
2016-11-18 10:33:37 -05:00
Cameron Stokes 17bc5a80ba ~ docs: Typo in agent options page. 2016-11-16 07:58:24 -08:00
Benjamin Farley e52e0b2a5a Small change to how operator docs read 2016-11-16 09:01:51 +00:00
Brian Shumate a487aec803 Docs: Web UI config updates (#2411)
* Updates around Web UI directory configuration

* consistent terms
2016-11-12 13:08:15 -08:00
Brian Shumate 1d6917fa9f Updated broken Extended Key Usage link (#2500) 2016-11-10 08:09:39 -08:00
Sumit Gupta 14cfeb8f7c Remove Extra > (#2499) 2016-11-10 08:09:17 -08:00
James Phillips 60d0c66be0
Revert "Updates Circonus metrics library and adds support for display name and tags."
This reverts commit bd490ec937a5859ba43b07d9103b3cb8f037e9e5 from #2491.
2016-11-09 16:21:02 -08:00
matt maier c7f98fe988 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 dbf6232238 Adds version info to docs for new Circonus options. 2016-11-09 13:26:20 -08:00
matt maier 62fe94b3d6 Update Circonus integration expose Check Display Name and Check Tags configuration options. 2016-11-09 15:33:37 -05:00
Kyle Havlovitz 1ffdf04bd7 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 f4e34397ac Clarify -retry-join docs. (#2469) 2016-11-03 14:22:46 -07:00
Kyle McCullough 697ea0f8eb 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 18926728d4 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 1e2ca107c2
Small tweaks to docs and syntax 2016-11-03 13:04:42 -04:00
Kyle Havlovitz a3af480c42
Add support for ECS task roles as an auth mechanism 2016-11-02 18:48:15 -04:00
Kyle Havlovitz b9aa912e4c
Move EC2 discovery logic into retryJoin for robustness 2016-11-02 14:35:37 -04:00
Kyle Havlovitz c6f461aa25 Enable snapshots in dev mode (#2453) 2016-10-31 14:39:47 -04:00
James Phillips bc29610124 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 1adbcff059 Merge pull request #2383 from hashicorp/jbs-1462
Clarify retry_join addresses for #1462
2016-10-20 11:40:03 -07:00
Brian Shumate fd794ec0b4
Reworded and applied to -retry-join also 2016-10-20 14:14:55 -04:00
James Phillips 78815ea44d Adds a note about child process reaping going away. 2016-10-06 21:38:29 -07:00
Andreas Böttger 13c1315916 json syntax corrected 2016-10-04 15:40:53 +02:00
Brian Shumate 7fbec39f1f
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
Brian Shumate df41000a94
Update variable value information as port must also be specified, fixes #2210 2016-09-29 12:50:00 -04:00
Brian Shumate a470c4901a
Finalize update for -bind 2016-09-27 18:36:19 -04:00
Brian Shumate bd43bd9981
Clarification 2016-09-27 12:38:32 -04:00
Brian Shumate ac9e1d6a10
Correct inaccurate bind reference, closes #2234 2016-09-27 12:05:22 -04:00
McKenna Jones 3390063ec6 cli flag formatting for agent docs and one guide 2016-09-26 21:22:01 -07:00
Seth Vargo 6a6d169ace
Clarify that hostname defaults to localhost for tcp 2016-09-21 12:20:36 -04:00
Brian Shumate af45d3463a
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 daa8a40993 Adds Operator endpoint link. 2016-09-15 13:13:09 -07:00
James Phillips 3b1f368fe5 Adds version note to near parameter. 2016-09-06 07:50:06 -07:00
James Phillips 6db4aea4c4 Tweaks options doc after latest merges. 2016-09-01 22:18:34 -07:00
James Phillips aed72ccc60 Merge pull request #2263 from sweeneyb/dnsPort
Add support for dns port as a command line option
2016-09-01 22:16:15 -07:00
James Phillips 1924eccf71 Merge pull request #2322 from hashicorp/pr-2321-slackpad
Adds a configurable timeout for DNS recursor client.
2016-09-01 22:11:54 -07:00
James Phillips ca71911eed
Tweaks documentation. 2016-09-01 21:50:46 -07:00
Pivotal DX129 2682410059 Merge remote-tracking branch 'upstream/master' 2016-09-01 10:15:32 -04:00
James Phillips d419a0ae0d
Changes default for `leave_on_terminate` based on server or client mode. 2016-08-31 23:39:11 -07:00
James Phillips 3304352272
Changes default DNS allow_stale to true. 2016-08-30 13:55:19 -07:00
James Phillips c063a1a8d0
Updates documentation with details on the Consul operator actions. 2016-08-30 13:15:37 -07:00
James Phillips 1b7a16b7d3
Adds new consul operator endpoint, CLI, and ACL and some basic Raft commands. 2016-08-30 00:02:50 -07:00
Pierre Delagrave a5fccc45db Added website documentation for the new recursor_timeout parameter 2016-08-29 14:41:30 -04:00
James Phillips 2f4c237cff
Adds a max raft multiplier and tweaks documentation. 2016-08-25 15:36:05 -07:00
James Phillips b339b0d2fc
Adds performance tuning capability for Raft, detuned defaults, and supplemental docs. 2016-08-24 21:58:37 -07:00
Brian Shumate b1164d256e Fix typo 2016-08-18 09:14:15 -04:00
James Phillips 1820de27fc Merge pull request #2235 from robwdux/patch-1
update ca tutorial to one more recent and relevant
2016-08-17 18:00:03 -07:00
James Phillips db4666c7e4 Update acl.html.markdown 2016-08-17 10:21:59 -07:00
James Phillips db9a72dde1
Merge branch 'master' into f-deregister-critical 2016-08-16 12:53:21 -07:00
James Phillips 607595f99e
Cleans up based on code review feedback. 2016-08-16 12:52:30 -07:00
James Phillips bc333335be
Adds an `X-Consul-Translate-Addresses` to signal translation is enabled. 2016-08-16 11:31:41 -07:00
James Phillips 817d7e93e4
Adds an "lan" tagged address so we have a way to get them all.
If we didn't have this, then there would be no way to know the LAN
address if address translation was turned on.
2016-08-16 10:49:03 -07:00
James Phillips f517f9ed0d
Fixes a typo and adds an admonition about only being in Consul 0.7+. 2016-08-16 09:27:20 -07:00
James Phillips b4f981c837
Adds ability to deregister a service based on critical check state longer than a timeout. 2016-08-16 01:00:26 -07:00
James Phillips 4ca26f68fd Tweaks translate_wan_addr documentation.
Adds a note about HTTP being 0.7 and later only.
2016-08-15 16:23:01 -07:00
James Phillips 3af9257cb8 Merge pull request #2275 from hashicorp/pr-2118-slackpad
Translates node addresses to WAN addresses where appropriate.
2016-08-15 16:16:56 -07:00
James Phillips ee2e161dfe
Updates docs for WAN address translation and tweaks some nearby unrelated docs. 2016-08-15 16:12:01 -07:00
Brian Shumate dc7824b0cd Add anchor 2016-08-15 16:48:54 -04:00
James Phillips 086a5af5ff
Finishes up DNS compression by adding opt-out, tests, and documentation. Fixes trim routine. 2016-08-11 16:27:08 -07:00
sweeneyb e8117ba622 Add support for dns port as a command line option 2016-08-10 04:05:56 +00:00
James Phillips ff64833b4a Adds a note about HTTP telemetry. 2016-08-09 16:03:59 -07:00
James Phillips 3585b5a4cb Merge pull request #2237 from hashicorp/f-acl-replication
Adds ACL replication.
2016-08-09 11:42:16 -07:00
James Phillips 5577b8ef66
Updates documentation for ACL replication. 2016-08-05 00:23:28 -07:00
rob dux 3bd9be7151 update ca tutorial to one more recent and relevant 2016-08-02 21:24:02 -05:00
Andrei Burd 06c0663082 Added missing comma 2016-08-01 18:46:43 +03:00
James Phillips 63ff6ebc2c Adds a cautionary note about the stats in the self API. 2016-07-29 13:45:25 -07:00
James Phillips 36b2ef619e Tweaks the agent docs for `EnableTagOverride`. 2016-07-23 14:48:54 -07:00
shalev67 0763f1a9f5 Added api agent docs enableTagOverride var 2016-07-22 20:21:07 +03:00
Jason Martin bda170a872
Escape verify_server_hostname angle-brackets 2016-07-20 15:57:07 -07:00
matt maier 9c3f14ce1b Change circonus_broker_search_tag to circonus_broker_select_tag to match same change to command/agent/config.go 2016-07-20 11:44:38 -04:00
James Phillips 51fbad91fd Merge pull request #2193 from hashicorp/pr-2188-slackpad
Adds Circonus support for telemetry metrics.
2016-07-19 17:15:29 -07:00
James Phillips ca5f42d61d Tweaks the docs a bit. 2016-07-19 15:54:52 -07:00
akbarahmed 99c1e0051d Merge remote-tracking branch 'upstream/master' 2016-07-19 11:01:55 -07:00
akbarahmed 25f6bc9d56 Unnest TaggedAddresses. Add sentence to mention that multiple Checks may
be specified as an array. Closes hashicorp/consul#2176
2016-07-19 10:55:46 -07:00
matt maier 53936f336d Documentation for Circonus Telemetry integration 2016-07-18 16:24:49 -04:00
Stu Small 6a664a4669 Fixing minor punctuation mistake. 2016-07-13 16:50:19 -06:00
Ryan Uber 62d0edbdd4 Merge pull request #1847 from mssola/dc-to-datacenter
[proposal] command: deprecated the -dc flag in the agent CLI
2016-07-05 13:01:51 -07:00
Sean Macdonald c24fe9f8b5 small typo 2016-07-02 01:29:00 -04:00
Ryan Uber 53dc58ff27 website: document near parameter of prepared queries 2016-07-01 11:50:09 -07:00