yosoyubik
3a7bd3a67f
ames: add tool for removing failed %watch flows
2023-02-06 16:36:27 +01:00
Ted Blackman
2bae8127bf
Merge branch 'develop' into i/6236/clay-cult-inspection
2023-02-03 15:31:08 -06:00
Ted Blackman
09a0da4c84
clay: refuse %cs subs scry unless at now
2023-02-03 12:33:27 -06:00
bacwyls
4c2e5460bd
clay: revise /subs %cs scry again
...
return an empty set instead of crashing if desk doesn't exist
2023-02-03 11:46:54 -06:00
Josh Lehman
3ec1172c5b
Merge branch 'develop' into fix-host-scry
2023-02-03 07:50:27 -08:00
bacwyls
3c7ff0c1f2
Merge branch 'develop' into bwyl/clay-subs
2023-02-03 09:47:04 -06:00
Josh Lehman
f348c443fd
Merge pull request #6258 from urbit/i/6257/un-hungry-webterm
...
webterm: safer printf rendering
2023-02-03 07:38:58 -08:00
bacwyls
f75e52b9ff
clay: revise scry for subscribers to a desk
...
Address PR6136 comments to improve the interface to this scry.
Now it looks like .^((set ship) %cs /=landscape=/subs)
instead of .^((set ship) %cs %/subs/landscape)
2023-02-02 17:20:21 -06:00
tadad
ae6187dd06
Merge branch 'develop' into da/flow-scry
2023-02-01 15:35:15 -06:00
Philip Monk
fa451613ec
Merge pull request #6246 from urbit/i/6245/is-ok
...
ames: put "is ok"/"not responding" behind |ames-verb
2023-02-01 14:07:38 -07:00
~wicrum-wicrun
08ada13c2b
Fix snapshotting bug
2023-02-01 21:52:30 +01:00
~wicrum-wicrun
1d1894a4cf
Merge branch 'develop' into i/6268/solid-state-publications
2023-02-01 17:24:20 +01:00
~wicrum-wicrun
23d43bd5f4
Add draft code
2023-02-01 17:05:18 +01:00
fang
11c7ae935f
dojo: match hoon.hoon %know %hint printing style
...
Hoon.hoon got the separating + added in 13d1c28
, but dojo was never updated
to match. Here, we pass it on.
2023-01-31 16:44:36 -08:00
Tinnus Napbus
abd6674ae0
show-vat: fix +show-vat to work with wafts
2023-01-30 14:46:39 +13:00
fang
f6ee174d64
webterm: simpler printf rendering
...
As it turns out, the exact behavior of the 'S' CSI command is not "move
contents up into scrollback", but rather "delete the top line(s), move other
contents up". This behavior leads webterm to eat into outputs whenever it
renders slogs.
Xterm(.js), when given a newline character at the bottom of a scroll region,
does produce the desired behavior of bumping the top line away into scrollback,
instead of obliterating it.
This implementation now diverges from vere's, which is unfortunate, but the
alternative is making webterm track the contents of the bottom-most line of
the default session, which seems rather ridiculous by comparison.
Fixes #6257 .
2023-01-28 00:34:03 +01:00
fang
faa16a1811
eyre: provide proper secure flag in %host scry
2023-01-27 14:37:56 +01:00
fang
eab40abcc9
Merge branch 'develop' into fix-host-scry
2023-01-27 11:54:28 +01:00
tadad
a5e0356fd6
Merge branch 'develop' into da/flow-scry
2023-01-26 17:10:11 -06:00
Philip Monk
735eedcf6e
Merge pull request #6249 from urbit/i/6244/kids
...
kiln: Keep %kids desk in sync after kelvin update
2023-01-26 16:07:23 -07:00
Philip Monk
821ed641ea
Merge pull request #6243 from urbit/i/6231/autoprop
...
autoprop: automated pill (& other boot prop) building
2023-01-26 16:07:01 -07:00
dachus
9e9fdeb2c6
flow scry added, moved to lull
2023-01-26 17:04:08 -06:00
Philip Monk
d328c7ad8c
kiln: update comment
2023-01-26 14:55:15 -07:00
Philip Monk
b125b48983
Merge remote-tracking branch 'origin/next/415' into develop
2023-01-26 10:24:34 -07:00
Tinnus Napbus
9255faf113
acme: comment clarification re: ports
2023-01-25 21:34:32 +13:00
Josh Lehman
6cd9fa56ae
Revert "Merge pull request #6199 from urbit/philip/install-once"
...
This reverts commit 427e219b5b
, reversing
changes made to 86cf63986b
.
2023-01-24 16:00:35 -08:00
Philip Monk
bd4e093ada
kiln: keep %kids desk in sync after kelvin update
...
This is the fourth option described in #6244 .
Fixes #6244
2023-01-24 15:49:43 -07:00
Philip Monk
8609599035
ames: put "is ok"/"not responding" behind |ames-verb
...
Fixes #6245
2023-01-24 13:07:19 -07:00
fang
28d1e35774
autoprop: write props into runtime version folder
...
For vere, we try to put it into a folder whose name is just the vere
version number. For other runtimes, we cat the whole version string
together.
2023-01-24 19:13:32 +01:00
fang
34fd6c854a
autoprop: auto-republish props for new runtime
...
Checks to see if we've changed the runtime version. If we have, publish
all the props at that new runtime version.
2023-01-24 19:12:14 +01:00
fang
23f2b9cb4d
autoprop: include missing dependencies
2023-01-23 21:28:27 +01:00
fang
9308ad9960
autoprop: update for new sole protocol
2023-01-23 21:27:55 +01:00
fang
c61a9f8bd7
clay: update %prep task for pages instead of blobs
2023-01-23 21:10:28 +01:00
fang
5a90d9bdd9
autoprop: include desk name in install prop meta
2023-01-23 20:45:33 +01:00
fang
8cfc9b5dfc
prop: rename prop tiers for style
2023-01-23 20:44:30 +01:00
fang
4272013244
autoprop: remove unused files from pkg/autoprop
2023-01-23 20:43:30 +01:00
fang
ba01f456a4
autoprop: include tasks in wake failure print
2023-01-23 20:43:21 +01:00
fang
c32f7bf408
autoprop: tweak cli ux
2023-01-23 20:43:05 +01:00
fang
136f146774
autoprop: rename from autopill
2023-01-23 20:42:47 +01:00
fang
196b9b4a77
autopill: clear next build time after build
2023-01-23 20:42:31 +01:00
fang
903351f86f
pill: support including clay blob store
...
During pill and install prop generation.
In autopill, we stop tracking a copy of the blob store, instead just
having the pill lib scry it out on-demand.
2023-01-23 20:42:13 +01:00
fang
817cfc8924
autopill: update for props, delayed write
...
Can now generate prop.jam files in additional to pills.
Now waits for five days of no changes before building the pill or prop.
2023-01-23 20:41:33 +01:00
fang
382d0d5522
pill: include %prep task in desk install props
...
Primes the blob store, making initial sync faster.
2023-01-23 20:40:52 +01:00
fang
f2d3a64d9c
clay: add /cs/===/bloc scry for all desk blobs
...
Lets you retrieve all blobs from the blob store that are in use by the
desk, both presently and in all its history.
2023-01-23 20:39:18 +01:00
fang
3fa5856f94
clay: add %prep task for priming the blob store
2023-01-23 20:36:34 +01:00
fang
b3b5400cec
boot: partial prop support
...
Doesn't yet support pre-userspace props, and the code might need to be
shuffled around a bit, but what's here works already.
2023-01-23 20:34:56 +01:00
fang
93f4d395b8
various: trailing newlines
2023-01-23 20:24:48 +01:00
fang
2dae678ec2
autopill: export to pills directory, not put root
2023-01-23 20:24:37 +01:00
fang
50da8a0bec
autopill: make pills when desk contents change
...
Automatically builds pills and writes them to urb/.put when relevant
desks change. Intended for deployment onto a livenet ship from which
pills may then be sourced.
2023-01-23 20:24:20 +01:00
fang
74e653053d
lib: move pill creation into /lib/pill
...
In preparation for pill building from outside the generators.
2023-01-23 20:24:02 +01:00
Tinnus Napbus
45810c9ff3
acme: handle https redirect in self-check
...
also: libdns handle 301 redirect during self-check
2023-01-23 21:48:08 +13:00
fang
6b80aec3c2
gen: +desk-requests, counts pending clay requests
...
Gives a summation of pending clay requests for a given desk, specifying
the number of local and incoming-from-foreign requests, and for the
latter, how many of those are awaiting the next revision of a desk
(read: are currently |sync-ing from the desk).
2023-01-22 21:51:39 +01:00
fang
50cfdb0f2a
clay: allow scrying out of pending requests
...
Implements a /cx/[our]//[now]/cult/[desk] endpoint, for getting a set of
pending requests for any given desk. We don't give the $cult for the
desk as-is, but instead slim the $roves back down into $raves, remove
clay protocol version metadata, and make sure to put our @p in place of
empty "for" fields.
2023-01-22 21:42:57 +01:00
Philip Monk
9fe4386ac5
Merge pull request #6228 from urbit/i/6227/kelvin-bump
...
apps: bump kelvin
2023-01-20 14:08:26 -07:00
fang
4d260147d4
chat-cli: put it to rest
...
Old groups software, no longer supported. Don't want this to be
re-linked and confuse people just trying to use their dojo.
2023-01-20 20:56:50 +01:00
Philip Monk
38540ada2c
apps: bump kelvin
...
Fixes #6227
2023-01-20 12:17:35 -07:00
Tinnus Napbus
8bf4373d13
remove unused components
...
Fixes #6216
- bitcoin: removed
- garden: new location https://github.com/tloncorp/landscape
- hs: removed
- urbit (vere), docker-image, ent, urcrypt:
new repo https://github.com/urbit/vere
2023-01-20 13:49:03 +13:00
Philip Monk
83b39e82a7
Merge remote-tracking branch 'origin/next/arvo' into m/detest
2023-01-18 18:01:59 -07:00
Philip Monk
9d56637916
clay: Drop foreign %wris responses
...
This flow is not supported, and it was causing issues releasing
416. This change just drops the responses to avoid crashing, but at
some point we should either support this flow or reject the request in
the first place.
2023-01-18 17:28:51 -07:00
Philip Monk
8a013d147d
Merge remote-tracking branch 'origin/master' into next/arvo
2023-01-18 16:13:44 -07:00
fang
e888960370
tests: move to root, out of pkg/arvo
...
Including these in pkg/arvo has caused many minor problems over the
years. We don't want to include them in releases, but this often meant
excluding them manually, which was error-prone.
Here, we move them out of /pkg/arvo/tests and into /tests. CI will have
to be updated to match, since we'll still want to include tests there.
2023-01-18 16:50:42 +01:00
Philip Monk
cb95c641a1
Merge pull request #6057 from urbit/jm/recurse-rm
...
kiln: recursive `|rm`
2023-01-17 15:32:30 -07:00
Philip Monk
35f1cdb93f
Merge pull request #6098 from wicrum-wicrun/patch-1
...
base-dev: remove `+fact-curry` from lib/agentio
2023-01-17 15:24:54 -07:00
Philip Monk
d9e5ebe806
Merge pull request #6117 from urbit/lf/lure
...
hoon: add +lure, for turning a singleton into a list
2023-01-17 15:22:58 -07:00
Philip Monk
77616520c3
ames: add logging for snubbing
2023-01-17 15:16:35 -07:00
Philip Monk
ecdd16dcf3
Merge remote-tracking branch 'origin/next/arvo' into lf/ames-snub
2023-01-17 15:06:11 -07:00
Philip Monk
899712383a
Merge pull request #6160 from urbit/jon/remove-plat
...
hoon: remove $plat
2023-01-17 15:00:27 -07:00
Philip Monk
427e219b5b
Merge pull request #6199 from urbit/philip/install-once
...
kiln: add `once` flag to |install
2023-01-17 14:55:55 -07:00
fang
0556e30e08
dill: clean up old-style userspace subscriptions
...
As of version %5, dill uses a new wire format for its userspace
subscriptions. Its existing subscriptions (read: the one subscription
into %hood for the default session) was never updated to use this new
style.
We observed a bug on one ship, where it had both old-style and new-style
subscriptions into hood, resulting in output being rendered twice. How
exactly this happened remains as of yet unclear.
Here, we forcefully clean up the old-style subscription, and
(re)establish the equivalent new-style subscription. This will prevent
issues like this from reoccurring.
2023-01-17 19:07:57 +01:00
Philip Monk
86cf63986b
Merge remote-tracking branch 'origin/jon/bartar-crusade' into next/415
2023-01-13 17:58:12 -07:00
Philip Monk
0791c455a6
hoon: put doccords behind parser flag
2023-01-13 17:41:07 -07:00
Philip Monk
40451fa727
Revert "Revert "Merge pull request #6039 from tadad/da/apt-in""
...
This reverts commit e306d32c74
.
2023-01-13 16:13:03 -07:00
Philip Monk
a7a3790346
kelvin: bump to 139
2023-01-13 16:12:35 -07:00
Philip Monk
cdaae65786
dojo: mule calls to doccords
2023-01-12 13:53:15 -07:00
Philip Monk
0119eef28d
Merge branch 'next/arvo' into jon/doccords
2023-01-12 13:14:06 -07:00
Philip Monk
3efce771d5
kiln: add once
flag to |install
...
It's often useful to |merge a desk, but if you're still getting updates
from your sync source, you may get overwritten in the future. In this
case, you want to merge and clear the sync source. With this change,
you can do this with:
```
|install ~ship %desk, =once &
```
2023-01-12 12:38:28 -07:00
Philip Monk
e306d32c74
Revert "Merge pull request #6039 from tadad/da/apt-in"
...
This reverts commit 31bb93846c
, reversing
changes made to 7940dd442b
.
Reverting because we can't upgrade jetted code without ensuring the jets
change in lockstep.
2023-01-11 15:12:11 -07:00
Philip Monk
7bbcceebaf
hoon: typo
2023-01-11 14:47:13 -07:00
Philip Monk
f36591493c
kelvin: landscape is only compatible with 416
2023-01-11 14:44:55 -07:00
Philip Monk
3d177369c0
kelvin: webterm is not compatible with 417
2023-01-10 16:41:16 -07:00
Philip Monk
7ef91f5218
kelvin: for apps, add compatibility with 417
2023-01-10 15:13:00 -07:00
fang
b78902c30e
Merge branch 'next/dill' into next/arvo
2023-01-10 20:22:29 +01:00
fang
5b160f0c74
zuse: bump kelvin to 416
...
And lull to 327.
2023-01-06 23:31:16 +01:00
fang
9a4e6d0f8e
webterm: v1.1.0
...
Compatibility with dill changes. Sessions support.
2023-01-06 14:04:59 +01:00
Philip Monk
9031128759
Merge pull request #6047 from bacwyls/team_patch
...
zuse: change team:title to return false for moons
2023-01-05 15:23:03 -07:00
Zach Alberico
53b429fe46
Merge branch 'next/arvo' into m/ruin-louder
2023-01-05 14:17:13 -08:00
Zach Alberico
5148399c1e
Merge branch 'next/arvo' into jon/remove-plat
2023-01-05 14:12:32 -08:00
fang
5a284197bf
Merge branch 'next/dill' into m/drum-sessions
2023-01-05 22:23:20 +01:00
fang
0af037571e
Merge branch 'next/arvo' into next/dill
2023-01-05 22:20:02 +01:00
fang
d384b01e7f
Merge branch 'master' into next/arvo
2023-01-05 22:13:43 +01:00
fang
db3fcdf4d5
Merge branch 'next/arvo' into fix-host-scry
2023-01-05 13:35:22 +01:00
drbeefsupreme
5b99f74c94
hoon: remove deprecated lustar parser
...
See #6052 . This is completely different from the +* used at the top
of doors, and has almost entirely been replaced by |$. The exception is
the use of the `%made` spec, not present in `|$`. I do not see an
obvious way to change `|$` to use `%made` since this `+*` parser uses
the name of the arm in the `%made` structure, unless we change the
AST of |$.
2023-01-04 18:33:47 -05:00
Hunter Miller
2506fb85f8
Merge pull request #6157 from urbit/lf/rebuild-wait-2
...
group-store: allow rebuilding .wait state
2023-01-04 13:10:00 -06:00
Hunter Miller
9316aebec7
group-store: only run rebuild once
2023-01-04 12:40:18 -06:00
fang
41f08b30b3
sole: update sole-action mark wrt recent changes
...
It was not properly accounting for the sole-id type change.
2023-01-04 19:10:46 +01:00
fang
ff84878c8b
lens: update for sole protocol changes
...
Dojo had also been incorrectly updated, assuming the type of
%lens-command changed to match. Since lens should only ever be used for
running commands on the local ship (and even that being contentious (; ),
we simply auto-fill the sole session id with the local ship name.
2023-01-04 19:10:33 +01:00
Hunter Miller
563aed6b7f
group-store: automatically run rebuild on load
2023-01-04 11:17:44 -06:00
drbeefsupreme
d5bf903f56
Merge branch 'next/arvo' into jon/doccords
2023-01-04 10:22:17 -05:00
Hunter Miller
936835cd0c
groups-store: fixing wire check for leaves
2023-01-03 18:50:05 -06:00
Hunter Miller
264678a908
group-store: correct target
2023-01-03 18:17:02 -06:00
Hunter Miller
4e3698f327
group-store: instead of only watching missing, restart any migration subscriptions that might be bad
2023-01-03 17:47:26 -06:00
tomholford
0f5433c014
Merge branch 'master' into next/groups
2023-01-03 14:16:28 -08:00
Philip Monk
0da6127ee4
Merge branch 'master' into next/arvo
2023-01-03 11:40:37 -07:00
Philip Monk
f230e2ec2d
Merge commit 'eb324b4fa4c2b08c76317601c88708c624f98c70'
2023-01-03 11:39:08 -07:00
Philip Monk
2f17a17406
Revert "wip"
...
This reverts commit 0e16d82a46
.
2023-01-03 11:37:43 -07:00
Philip Monk
56ceee5006
Revert "Merge pull request #6171 from urbit/jb/release/vere"
...
This reverts commit 21f7023198
, reversing
changes made to 1e09188065
.
2023-01-03 11:24:54 -07:00
fang
36731f92e7
Merge branch 'next/dill' into m/drum-sessions
...
Also cleans up some remaining merge artefacts.
2023-01-03 19:08:41 +01:00
fang
ea3c64de79
king: clean up merge artefacts
2023-01-03 19:02:09 +01:00
fang
721fa05519
Merge branch 'next/arvo' into next/dill
2023-01-03 18:56:33 +01:00
fang
ceafb37042
vere: remove trailing newlines from u3l_log calls
...
As of dc2c990
these are redundant. See also 9631be6
.
2023-01-03 17:36:37 +01:00
fang
a15111a35c
Merge branch 'next/arvo' into m/drum-sessions
2023-01-03 17:19:32 +01:00
fang
fb9fd34956
Merge branch 'master' into next/arvo
2023-01-02 22:42:32 +01:00
Joe Bryan
eb324b4fa4
vere: bumps version
2022-12-20 18:55:39 -05:00
Joe Bryan
9a16d670e6
Merge branch 'master' into jb/release/vere
2022-12-16 23:07:10 -05:00
drbeefsupreme
d7edbd63da
hoon: doccordsify hoon.hoon comments
...
making hoon.hoon more legible to doccords. also moving some things
around that seemed to be in the wrong place
2022-12-16 15:47:09 -05:00
drbeefsupreme
3da062594e
hoon: sweeten =+ foo |@ ++ $ bar -- patterns
...
|* foo bar is sugar for =+ foo |@ ++ $ bar --, and newbies find
the old style confusing. this switches out the |@ pattern for the |*
one, at least in layer <=4. the only ones remaining are +toad, +rune,
and +runo, which are already tweaked in #5873 so we omit them here.
2022-12-16 12:46:13 -05:00
Joe Bryan
4e9de85aba
vere: refactors http server init for better error messages
2022-12-16 11:17:53 -05:00
Joe Bryan
1f84fcf262
vere: fix queu short-args parsing
2022-12-16 10:00:22 -05:00
Joe Bryan
aa83de5e8b
vere: bumps version
2022-12-16 00:52:19 -05:00
Joe Bryan
4b5494fb85
vere: fix "queu" command argument parsing
2022-12-16 00:34:54 -05:00
Joe Bryan
4d08d874c6
vere: make full replay (play -f) command bypass corruption
2022-12-16 00:34:15 -05:00
Zach Alberico
34e8ff7616
Merge branch 'next/arvo' into ted/ames-clog-less
2022-12-15 19:17:45 -08:00
Joe Bryan
f095679e02
Merge pull request #6167 from joemfb/ctrl-z-replay
...
vere: support ctrl-z in play command
2022-12-15 22:04:33 -05:00
Joe Bryan
124aec68ad
term: skip prompt refresh on ^c under -t
2022-12-15 21:48:34 -05:00
Joe Bryan
8671d3091d
u3: make the fault handler robust against initialization reorder
2022-12-15 21:26:30 -05:00
Joe Bryan
f7fd944e02
mars: cleanup event log on exit
2022-12-15 21:22:54 -05:00
Joe Bryan
f4235ebc91
vere: handle ctrl-z like ctrl-c in play command
2022-12-15 21:22:36 -05:00
Zach Alberico
a2173f1eb3
Merge branch 'next/arvo' into lf/ames-snub
2022-12-15 17:40:04 -08:00
Zach Alberico
0153d11972
Merge branch 'master' into lf/rebuild-wait-2
2022-12-15 17:36:44 -08:00
Zach Alberico
e60e15b022
Merge remote-tracking branch 'origin/master' into merge/master-to-next
2022-12-15 14:04:02 -08:00
Zach Alberico
fd766faa03
Fix build break typo in azimuth
...
Fixes typo introduced in 0e16d82a46
2022-12-15 13:21:19 -08:00
drbeefsupreme
4d084005d7
dprint: call $ arms $ arms
2022-12-15 15:06:02 -05:00
drbeefsupreme
835428d820
dprint: cut off signatures of length >= 3
...
anytime a gate prints with a complicated sample or product type it is
frequently extremely long. 3 is probably too low of a cutoff number, but
ideally a future version will have verbosity settings that will help
control this.
2022-12-15 15:04:33 -05:00
Liam Fitzgerald
c0be44f790
helm: add ames passthrough for %snub
2022-12-15 13:47:36 -06:00
Liam Fitzgerald
14baf6f3d6
ames: add %snub functionality
...
Adds .snub to ames-state, a global blocklist for ships. If a packet is
received from a ship that is in the .snub set, it is immediately
dropped. Adds %snub to ames' $task, to allow manipulating this list
2022-12-15 13:37:14 -06:00
drbeefsupreme
e04262ed2d
hoon: swap ?. for ?: on +loaf and +loan
...
no idea how this ended up happening, but apparently it was my fault.
2022-12-15 14:24:38 -05:00
Joe Bryan
e0320ddfc2
vere: bumps version
2022-12-15 14:18:56 -05:00
Joe Bryan
8e677537c0
mars: fix bail:meme retry counter
2022-12-15 14:10:22 -05:00
drbeefsupreme
517945c582
hoon: remove $plat
...
$plat was a type of $plot added in
bc6ad0456d
plots are no longer a thing, so
neither should be plats.
2022-12-14 20:43:39 -05:00
drbeefsupreme
44aa90c9ad
hoon: remove +hint:ax
...
all this did was set .nut. while it could be used with doccords, it is
currently unused, and none of the other values in the sample of _ax are
set this way (bug, def, cox, hay, dom). i experimented a little bit with
trying to make use of this but it made things overall more unreadable,
and it wouldn't make sense to do it without doing the same for other
values of the sample. im guessing this is just an old style.
2022-12-14 20:27:08 -05:00
Joe Bryan
a7880717e3
vere: adds --auto-meld for play subcommand
2022-12-14 18:30:09 -05:00
Joe Bryan
3843c6090f
vere: adds full replay option to play subcommand
2022-12-14 17:47:40 -05:00
Joe Bryan
82d5738df4
vere: adds dedicated replay command: play
2022-12-14 17:47:40 -05:00
Joe Bryan
67ef11117f
vere: updates command docs
2022-12-14 17:47:39 -05:00
Joe Bryan
c15b822087
mars: adds replay implementation
2022-12-14 17:47:39 -05:00
Joe Bryan
a5362f2af0
vere: ports u3_disk_read_list()
2022-12-14 17:47:39 -05:00
Joe Bryan
9daab2fd5a
vere: ports synchronous event log iterator
2022-12-14 17:47:33 -05:00
Joe Bryan
99a8ccda7b
vere: ports synchronous lmdb iterator
2022-12-14 17:47:33 -05:00
Joe Bryan
91f7818ab7
vere: factors out sift/etch functions event serialization
2022-12-14 17:47:33 -05:00
Joe Bryan
5a775d1c79
u3: ports meld measurement printfs
2022-12-14 17:47:33 -05:00