Commit Graph

1183 Commits

Author SHA1 Message Date
Sasha 25278c312a str4d suggested changes to release-notes-4.6.0.md 2021-12-22 17:36:39 -08:00
Sasha eeecf63dae make-release.py: Updated release notes and changelog for 4.6.0. 2021-12-23 00:35:41 +00:00
Sasha de4dd9f231 make-release.py: Updated manpages for 4.6.0. 2021-12-23 00:35:40 +00:00
Jack Grigg 9c4a1e7ad7 make-release.py: Updated release notes and changelog for 4.6.0-rc1. 2021-12-18 04:25:50 +00:00
Jack Grigg 1c910cf9cc make-release.py: Updated manpages for 4.6.0-rc1. 2021-12-18 04:25:50 +00:00
Jack Grigg 8387aa40cf Update release notes 2021-12-18 01:44:27 +00:00
MarcoFalke 6d60f1a9c9 [rpc] mining: Omit uninitialized currentblockweight, currentblocktx
zcash/zcash:
The `getmininginfo` RPC now omits `currentblockize` and `currentblocktx`
when a block was never assembled via RPC on this node during its current
process instantiation. The relevant RPCs are `generate` (regtest only) and
`getblocktemplate`. Blocks are also assembled when running the internal
miner (`zcashd -gen=1`), after the node mines its first block.

(cherry picked from commit bitcoin/bitcoin@fa178a6385)
2021-12-17 09:35:30 -07:00
Larry Ruane d0e836a15e Don't log 'ERROR: spent index not enabled' 2021-12-15 07:53:26 -07:00
Kris Nuttycombe 9202b127d0 Merge remote-tracking branch 'upstream/master' into feature/wallet_orchard 2021-11-23 18:38:07 -07:00
Kris Nuttycombe 7be1ec9c23
Minor textual fixes to release notes.
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2021-11-18 11:40:23 -07:00
Kris Nuttycombe 92445ba0a5 Apply suggestions from code review
Co-authored-by: str4d <jack@electriccoin.co>
2021-11-18 10:54:12 -07:00
Kris Nuttycombe de57da38ce Document mnemonic-seed-related RPC method changes & update changelog. 2021-11-17 18:01:28 -07:00
Dimitris Apostolou e05c1ddf8a
Fix typos 2021-11-14 16:27:09 +02:00
Kris Nuttycombe 3329b26374
Merge pull request #5339 from git-sgmoore/patch-1
Update reduce-traffic.md - add one word
2021-10-14 18:41:57 -06:00
Kris Nuttycombe 0e685b67da
Fix wallet-related wording in doc/reduce-traffic.md 2021-10-13 13:20:40 -06:00
Jack Grigg d397f4e36d Update v4.5.1-1 release notes with bugfix 2021-10-08 17:07:24 +00:00
Jack Grigg e2abf34cc9 make-release.py: Updated release notes and changelog for 4.5.1-1. 2021-10-08 17:03:31 +00:00
Jack Grigg 3a20ade75d make-release.py: Updated manpages for 4.5.1-1. 2021-10-08 17:03:31 +00:00
Kris Nuttycombe 7b40f87404 Update release notes for v4.5.1-1 to reflect the addition of `listaddresses` 2021-10-07 14:25:50 -06:00
sgmoore 5ad669baca
Update reduce-traffic.md - add one word
Added one word "a" at line 49
2021-10-02 07:52:45 -07:00
Jack Grigg 4bfbdfa4ef make-release.py: Updated release notes and changelog for 4.5.1. 2021-09-29 01:49:51 +01:00
Jack Grigg 283fd6feda make-release.py: Updated manpages for 4.5.1. 2021-09-29 01:49:50 +01:00
Jack Grigg 6e90c84be7 Fix bugs in testnet Orchard circuit
The consensus branch ID is updated (as the NU5 consensus rules are
altered). The testnet NU5 activation height is also reset.
2021-09-28 22:56:37 +01:00
Jack Grigg fd49f78042 wallet: Check spent shielded notes in CWalletTx::IsFromMe
The "IsFromMe" logic was implemented in several places in the Bitcoin
Core wallet. We had correctly updated CWallet::IsFromMe(CTransaction)
(which was used in most places in the wallet) to check for shielded
notes being spent, but did not notice that CWalletTx::IsFromMe also
needed this check.

This bug has existed since before Zcash launched. It went unnoticed
because CWalletTx::IsFromMe was previously only called from code
used to either create purely-transparent transactions, or provide
informational output on non-critical RPC methods.

Closes zcash/zcash#5325.
2021-09-28 02:51:04 +01:00
Jack Grigg 4fb372efdd Add notable changes to v4.5.0 release notes 2021-09-23 05:09:55 +01:00
Jack Grigg a1d17292b4 make-release.py: Updated release notes and changelog for 4.5.0. 2021-09-23 04:20:16 +01:00
Jack Grigg 5ceb64682c make-release.py: Updated manpages for 4.5.0. 2021-09-23 04:20:15 +01:00
Jack Grigg bfd7b31efe make-release.py: Updated release notes and changelog for 4.5.0-rc1. 2021-09-16 23:34:14 +01:00
Jack Grigg 518895a3dd make-release.py: Updated manpages for 4.5.0-rc1. 2021-09-16 23:34:14 +01:00
Jack Grigg fc8726e6a4 Use wtxid for peer state management 2021-09-10 21:50:24 +01:00
str4d cd51c591ef
book: Note that cargo patches work with absolute paths 2021-06-15 21:55:55 +01:00
Jack Grigg 292f830509 book: Add dev guide page about Rust dependencies 2021-06-15 20:59:18 +01:00
Jack Grigg 08baaaa492 Fix tests that assume CTxOuts can be "null" 2021-06-13 01:45:17 +01:00
str4d 0dade79ce7
Fix typo in release notes
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2021-06-10 00:34:43 +01:00
Jack Grigg 41a21cab89 Add bugfix to v4.4.1 release notes 2021-06-09 23:40:32 +01:00
Jack Grigg 5fe7df4c6f make-release.py: Updated release notes and changelog for 4.4.1. 2021-06-09 23:19:49 +01:00
Jack Grigg 07d047d40a make-release.py: Updated manpages for 4.4.1. 2021-06-09 23:19:49 +01:00
Jack Grigg 5ef2270b2a make-release.py: Updated release notes and changelog for 4.4.1-rc1. 2021-06-08 22:45:20 +01:00
Jack Grigg 79b497aa80 make-release.py: Updated manpages for 4.4.1-rc1. 2021-06-08 22:45:20 +01:00
str4d 8936cfef75
doc: Add removal of 32-bit Windows binaries to release notes 2021-06-05 20:25:36 +01:00
Jack Grigg 997ca6ee9c doc: Add Windows version support change to release notes 2021-06-05 15:40:04 +01:00
Jack Grigg ad1c30873d make-release.py: Updated release notes and changelog for 4.4.0. 2021-04-15 16:55:39 +12:00
Jack Grigg a32841d999 make-release.py: Updated manpages for 4.4.0. 2021-04-15 16:55:39 +12:00
Jack Grigg 0342eb2212 book: Fix comment in metrics example, and clarify usage 2021-04-15 12:41:18 +12:00
Jack Grigg 30f68da525 make-release.py: Updated release notes and changelog for 4.4.0-rc1. 2021-04-09 17:40:36 +12:00
Jack Grigg 253da68a2d make-release.py: Updated manpages for 4.4.0-rc1. 2021-04-09 17:40:36 +12:00
Homu ba4eb241e7 Auto merge of #4996 - str4d:2074-net-blocksonly, r=str4d
Add -blocksonly option

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6993
- bitcoin/bitcoin#7046
- bitcoin/bitcoin#6780
  - The third commit (we backported the rest in #2390).
- bitcoin/bitcoin#7126
- bitcoin/bitcoin#7439
- bitcoin/bitcoin#15990
  - Only the `-blocksonly` documentation changes.
- bitcoin/bitcoin#16555
- bitcoin/bitcoin#18391
  - Only the `-blocksonly` documentation changes.

Part of #2074.
2021-03-31 11:27:22 +00:00
glowang 49d420f808 Update -blocksonly documentation
When -blocksonly is set to 1, it interacts with the -walletbroadcast
parameter and sets it to 0 if it has not been set already.This behavior
is not captured by the current documentation, which claims that -blocksonly
does not impact any wallet transactions.

(cherry picked from commit 621e86ee8d0102e2bf41f7656a368083b89b2f83)

Zcash: Excludes max-peer doc changes, since we don't have
block-relay-only peers yet.
2021-04-01 00:24:19 +13:00
MarcoFalke 8dd2c02a3a doc: Mention blocksonly in reduce-traffic.md, unhide option
(cherry picked from commit fa8ced32a60dea37ac169241cf9a1f708ef46c4b)

Zcash: Only the documentation changes.
2021-04-01 00:13:49 +13:00
Jack Grigg c940fd302b book: Fix typo in metrics documentation 2021-03-31 09:21:28 +13:00
Jack Grigg e2e5df28a9 metrics: Rename metrics with consistent naming scheme
- Add zcash. prefix to common metrics.
- Use .total suffix for accumulating counters instead of .count.
- Group names where possible.
- Shorten names where possible (and still clear).
2021-03-30 15:12:36 +13:00
Jack Grigg 958ffeafd3 metrics: Move documentation into zcashd book 2021-03-30 15:12:36 +13:00
Jack Grigg d08cdbe5f7 metrics: Implement IP access control on Prometheus scrape endpoint 2021-03-30 15:12:08 +13:00
Jack Grigg 59da774f22 Mention in release notes that metrics names may still change 2021-03-30 15:12:08 +13:00
Jack Grigg 34d2edb619 Add -prometheusmetrics to release notes 2021-03-30 15:12:08 +13:00
Jack Grigg e3282abf75 doc: Minor fixes to v4.3.0 release notes 2021-02-24 21:58:32 +00:00
Jack Grigg 8b91e3bf21 make-release.py: Updated release notes and changelog for 4.3.0. 2021-02-24 20:17:10 +00:00
Jack Grigg f09bef8634 make-release.py: Updated manpages for 4.3.0. 2021-02-24 20:17:10 +00:00
Jack Grigg 6052843b6f make-release.py: Updated release notes and changelog for 4.3.0-rc1. 2021-02-19 22:05:06 +00:00
Jack Grigg 1e12f4b00e make-release.py: Updated manpages for 4.3.0-rc1. 2021-02-19 22:05:05 +00:00
Jack Grigg 96317f3189 Fill out the rest of the 4.3.0 release notes 2021-02-19 18:21:01 +00:00
Jack Grigg 36e0e0e16c Add IBD download traffic reduction to release notes
Co-authored-by: therealyingtong <yingtong@z.cash>
2021-02-19 18:20:08 +00:00
Jonas Schnelli 69ca2dde56 add (max)uploadtarget infos to getnettotals RPC help
Zcash: Update recommended minimum -maxuploadtarget
2021-02-17 13:34:49 -07:00
Jonas Schnelli 97e9a8162f add documentation for exluding whitelistes peer from maxuploadtarget 2021-02-17 13:34:49 -07:00
Jonas Schnelli 2f81b408c5 [docs] rename reducetraffic.md to reduce-traffic.md 2021-02-17 13:34:49 -07:00
MarcoFalke 81adf52277 [doc] Add -maxuploadtarget release notes 2021-02-17 19:23:38 +00:00
fanquake 2a10fcd083 [doc] Improve lanaguge in reducetraffic.md 2021-02-17 19:23:38 +00:00
Jonas Schnelli 4212d1c96d [doc] add documentation how to reduce traffic 2021-02-17 19:23:38 +00:00
Homu cc5574b819 Auto merge of #4963 - defuse:fix-updatecheck-token, r=nuttycom
Move the github API token out of updatecheck.py into an untracked file.
2021-01-28 16:38:34 +00:00
Jack Grigg aec304d7a0 Show README as root of zcashd book 2021-01-27 17:45:45 +00:00
Jack Grigg 8cfbabd6ed Set up an mdbook in which we can document zcashd's architecture design
I've explained various parts of zcashd's node architecture enough times
now that it really should be written down!
2021-01-27 17:16:34 +00:00
Taylor Hornby 92da71b0fe Document the required .updatecheck-token file in the release docs 2021-01-25 13:48:02 -07:00
Kris Nuttycombe 993feb59f8 make-release.py: Updated release notes and changelog for 4.2.0. 2020-12-21 12:58:15 -07:00
Kris Nuttycombe a6eb9fc7d0 make-release.py: Updated manpages for 4.2.0. 2020-12-21 12:55:52 -07:00
Kris Nuttycombe a0dd3e3ce5 make-release.py: Updated release notes and changelog for 4.2.0-rc1. 2020-12-19 09:56:36 -07:00
Kris Nuttycombe 0b5b6d5186 make-release.py: Updated manpages for 4.2.0-rc1. 2020-12-19 09:53:28 -07:00
Dimitris Apostolou f459e43dc9
Update links 2020-12-13 11:24:44 +02:00
MarcoFalke 15721275d0 [qa] Switch to py3
Zcash: We already did this, so most of the backported changes are
ancillary (license header updates and style), but a few are relevant.
2020-11-21 02:33:27 +00:00
Kris Nuttycombe 251405491b Add notable changes to release notes for v4.1.1 2020-11-16 10:26:11 -07:00
Kris Nuttycombe 7ec8a9c5f4 make-release.py: Updated release notes and changelog for 4.1.1. 2020-11-16 10:23:40 -07:00
Kris Nuttycombe 092829cf5b make-release.py: Updated manpages for 4.1.1. 2020-11-16 10:23:40 -07:00
str4d e531d72337
doc: Adjust subtree developer notes to refer to Zcash
We don't maintain any of the current subtrees, but we might in future.

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-11-10 01:40:51 +00:00
Sjors Provoost c0c05ebb34 doc: improve subtree check instructions 2020-11-09 23:06:21 +00:00
Homu 84a5830aaa Auto merge of #4829 - str4d:backport-lints, r=str4d
Backport useful lints from upstream

Cherry-picked from the following upstream PRs:
- bitcoin/bitcoin#6892
- bitcoin/bitcoin#11151
- bitcoin/bitcoin#11300
- bitcoin/bitcoin@96d91b79bd
- bitcoin/bitcoin#12097
- bitcoin/bitcoin#12098
- bitcoin/bitcoin#12442
- bitcoin/bitcoin#12572
- bitcoin/bitcoin#12757
- bitcoin/bitcoin#11878
- bitcoin/bitcoin#12933
- bitcoin/bitcoin#12871
- bitcoin/bitcoin#12972
- bitcoin/bitcoin#13281
- bitcoin/bitcoin#13385
- bitcoin/bitcoin#13041
- bitcoin/bitcoin#13454
- bitcoin/bitcoin#13448
- bitcoin/bitcoin#13510
- bitcoin/bitcoin#13851
- bitcoin/bitcoin#13863
- bitcoin/bitcoin#14115
- bitcoin/bitcoin#14831
- bitcoin/bitcoin#15164
- bitcoin/bitcoin#15170
- bitcoin/bitcoin#15166
- bitcoin/bitcoin#16036
- bitcoin/bitcoin#16768
- bitcoin/bitcoin#13494

Several of the lints fail for our current codebase; these will be addressed in a
subsequent PR.
2020-11-09 21:20:55 +00:00
str4d 4b69b94bba
Small documentation fixes
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-11-09 17:15:46 +00:00
Daira Hopwood 4f331d0f7f
Update doc/release-notes/release-notes-4.1.0.md
Co-authored-by: ying tong <yingtong@z.cash>
2020-11-03 09:52:59 +00:00
Daira Hopwood f8c9a1f2d6
Update doc/release-notes/release-notes-4.1.0.md
Co-authored-by: ying tong <yingtong@z.cash>
2020-11-03 09:51:08 +00:00
Sean Bowe fe681d2cc6
make-release.py: Updated release notes and changelog for 4.1.0. 2020-11-02 13:40:54 -07:00
Sean Bowe 453dacccf8
make-release.py: Updated manpages for 4.1.0. 2020-11-02 13:40:54 -07:00
Jack Grigg f318ab3776 lints: Use Zcash-specific include guards for new files 2020-10-27 23:05:19 +00:00
vim88 27f924108c Scripts and tools & Docs: Used #!/usr/bin/env bash instead of obsolete #!/bin/bash, added linting for .sh files shebang and updated the Developer Notes. 2020-10-27 23:05:19 +00:00
practicalswift aade01b184 docs: Mention lint-locale-dependence.sh in developer-notes.md 2020-10-27 23:05:02 +00:00
practicalswift 653846b0a4 Document include guard convention 2020-10-27 23:05:02 +00:00
therealyingtong d66cabf8c9 Update release-notes-4.1.0-rc1.md 2020-10-28 02:54:01 +08:00
therealyingtong 3cdef42bcc make-release.py: Updated release notes and changelog for 4.1.0-rc1. 2020-10-28 02:51:45 +08:00
therealyingtong 1f731e8355 make-release.py: Updated manpages for 4.1.0-rc1. 2020-10-28 02:51:44 +08:00
str4d e9b836d612
Update example scripted-diff comit in doc/developer-notes.md 2020-10-26 17:59:18 +00:00
MarcoFalke 6506fbacf1 test: Move linters to test/lint, add readme 2020-10-26 17:36:26 +00:00
John Newbery 9645ae5be0 [docs] document scripted-diff 2020-10-26 17:20:55 +00:00
Jack Grigg 11baa4d49d doc: Add Clang and libc++ migration to release notes 2020-10-16 16:48:56 +01:00
mruddy edfb4d98e7 [depends, zmq, doc] avoid deprecated zeromq api functions
Zcash: Backported from bitcoin/bitcoin#13578
2020-10-05 22:54:19 +01:00
Homu 4705aae32e Auto merge of #4763 - rex4539:remove-bitcoin-release-notes, r=str4d
Remove Bitcoin release notes

Those appear to be totally unnecessary.
2020-10-05 17:53:53 +00:00
Dimitris Apostolou c84ae00cbf
Remove Bitcoin release notes 2020-10-03 22:58:39 +03:00
Dimitris Apostolou 1fa5d4670a
Remove deprecated init.md 2020-10-03 22:43:45 +03:00
fanquake 4526ecf9b2 doc: remove OpenSSL from build instructions and licensing info 2020-09-30 00:40:12 +01:00
Dimitris Apostolou 67ffb189b7
Fix typos 2020-09-25 10:49:57 +03:00
Sean Bowe 02c5f089cf
minor: Add backticks to avoid formatting in 4.0.0 release notes. 2020-09-01 14:58:04 -06:00
Sean Bowe 505495a73d
make-release.py: Updated release notes and changelog for 4.0.0. 2020-09-01 13:31:19 -06:00
Sean Bowe eedd28599b
make-release.py: Updated manpages for 4.0.0. 2020-09-01 13:31:19 -06:00
Sean Bowe c0f50ef8e6
Specify 4.0.0 in release notes 2020-08-27 09:08:22 -06:00
Sean Bowe 5a56246b91
Update names of contributors in release notes. 2020-08-27 09:07:15 -06:00
Sean Bowe af36ceae88
Add release notes to describe the Canopy network upgrade. 2020-08-26 12:08:06 -06:00
Sean Bowe 95d159c0e7
make-release.py: Updated release notes and changelog for 4.0.0-rc1. 2020-08-26 10:17:07 -06:00
Sean Bowe 4ce87e9e16
make-release.py: Updated manpages for 4.0.0-rc1. 2020-08-26 10:17:06 -06:00
Jack Grigg bf4730dd64 contrib: Update macdeploy README 2020-08-08 00:12:10 +01:00
Jack Grigg 927a03465f Merge branch 'master' into modernise-macos-toolchain 2020-08-08 00:07:31 +01:00
Jack Grigg 695d554ef3 doc: Update release notes for tracing backend 2020-08-07 15:26:28 +01:00
Kris Nuttycombe 0391809da1 Remove amqp code and Proton library depenencies & flags. 2020-07-31 13:08:18 -06:00
fanquake e04c184205 build: set minimum supported macOS to 10.12 2020-07-30 04:33:36 +01:00
fanquake a0f3ef7e13 doc: mention that macOS 10.10 is now required 2020-07-30 04:33:36 +01:00
Homu 615efd2a52 Auto merge of #4584 - defuse:update-ignore, r=str4d
Block release when we haven't checked dependency updates for security fixes
2020-07-29 10:45:44 +00:00
ying tong f7b3a55505
Update doc/release-notes/release-notes-3.1.0.md
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-07-29 07:21:25 +08:00
therealyingtong b5ee15b781
Add Debian8 deprecation to release notes 2020-07-29 05:42:12 +08:00
therealyingtong 369c16ef44
Set APPROX_RELEASE_HEIGHT to 917000 and update release-notes-3.1.0.md 2020-07-28 07:57:58 +08:00
therealyingtong 228b17c9e0
make-release.py: Updated release notes and changelog for 3.1.0. 2020-07-28 07:02:06 +08:00
therealyingtong f25e86a460
make-release.py: Updated manpages for 3.1.0. 2020-07-28 07:02:06 +08:00
Homu 162d5a50ee Auto merge of #4610 - ebfull:testnet-dev-fund, r=str4d
Add dev fund addresses and set activation height for testnet NU4 activation.
2020-07-27 09:05:53 +00:00
therealyingtong 62c3613816
Delay testnet activation height by one week 2020-07-24 08:15:35 +08:00
therealyingtong 8a4c51508a
Set Canopy testnet activation height to 1020500 2020-07-18 00:28:45 +08:00
Daira Hopwood f7c7c76bee Fix the formatting of the 3.0.0 release notes.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-07-17 15:15:06 +01:00
therealyingtong 07fb092b12
Edit release notes to specify that rc2 does not enable Canopy support on the testnet 2020-07-15 22:11:22 +08:00
therealyingtong 4af884d267
make-release.py: Updated release notes and changelog for 3.1.0-rc2. 2020-07-15 21:51:09 +08:00
therealyingtong 5769654975
make-release.py: Updated manpages for 3.1.0-rc2. 2020-07-15 21:51:08 +08:00
therealyingtong d7b976b737
make-release.py: Updated release notes and changelog for 3.1.0-rc1. 2020-07-14 14:38:11 +08:00
therealyingtong e255e8bd0a
make-release.py: Updated manpages for 3.1.0-rc1. 2020-07-14 14:38:10 +08:00
ying tong 2bf1985097
Apply suggestions from code review
Co-authored-by: str4d <thestr4d@gmail.com>
2020-07-14 10:50:15 +08:00
therealyingtong a72246adc8 Update release notes for v3.1.0 2020-07-13 17:34:12 +08:00
Taylor Hornby 44c35c6f68 Change release instructions to block the release when dependencies are not updated and not postponed. 2020-06-24 18:14:47 -06:00
Wladimir J. van der Laan 42b025705f doc: Update release notes for `-debuglogfile` 2020-05-28 10:58:04 -03:00
Sean Bowe 7a0a5a4d71
make-release.py: Updated release notes and changelog for 3.0.0. 2020-05-22 11:48:24 -06:00
Sean Bowe 5614085790
make-release.py: Updated manpages for 3.0.0. 2020-05-22 11:48:23 -06:00
Sean Bowe a6403c80b4
make-release.py: Updated release notes and changelog for 3.0.0-rc1. 2020-05-21 07:34:53 -06:00
Sean Bowe 957cbb68f1
make-release.py: Updated manpages for 3.0.0-rc1. 2020-05-21 07:34:53 -06:00
Sean Bowe d0c96683bf
Set the Heartwood activation height to 903000. 2020-05-19 14:38:49 -06:00
Sean Bowe 98345b2ead
Update release notes for v2.1.2-3. 2020-05-08 13:28:44 -06:00
Sean Bowe ca7b2dbd8e
make-release.py: Updated release notes and changelog for 2.1.2-3. 2020-05-08 12:41:23 -06:00
Sean Bowe 8b5365e127
make-release.py: Updated manpages for 2.1.2-3. 2020-05-08 12:41:23 -06:00
Sean Bowe d86b56bd6c
Modify release notes for v2.1.2-1 and v2.1.2-2 to reflect the changes more accurately. 2020-05-08 11:47:41 -06:00
Sean Bowe 2e52500acf
make-release.py: Updated release notes and changelog for 2.1.2-2. 2020-05-08 11:43:55 -06:00
Sean Bowe 6d82cff680
make-release.py: Updated manpages for 2.1.2-2. 2020-05-08 11:43:54 -06:00