jasder
/
moby
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
12,979 Commits 10 Branches 339 Tags 274 MiB
Commit Graph

774 Commits

Author SHA1 Message Date
Jean-Paul Calderone 807f486f87 Change some instances of this mistake in the documentation as well. 
Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com>

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@linux.com> (github: jfrazelle)
 2015-01-09 20:31:38 -08:00
James Turnbull 90149b11db Merge pull request #9964 from duglin/MoveBuildDocs 
Move docs on the build API out of 'misc' and under 'Images' section
 2015-01-09 07:17:53 -05:00
James Turnbull 2675f1a153 Merge pull request #9974 from lasote/master 
Added c++ client library for REST API
 2015-01-09 07:16:38 -05:00
Malte Janduda 813ff7f19d Adding IPv6 network support to docker 
Signed-off-by: Malte Janduda <mail@janduda.net>
 2015-01-09 00:13:09 +01:00
Andreas Köhler 3807d96d37 Fix order of pause and port in command line documentation. 
Signed-off-by: Andreas Köhler <andi5.py@gmx.net>
 2015-01-08 23:21:54 +01:00
Fred Lifton b168ef274a Merge pull request #9898 from SvenDowideit/document-https-proxy-daemon-setup 
Add @ArikaChen's tip for using HTTPS proxy to pull
 2015-01-08 10:40:02 -08:00
Luis Martínez de Bartolomé Izquierdo e54d8c47e4 Add c++ client library 
Signed-off-by: Luis Martínez de Bartolomé Izquierdo <lmartinez@biicode.com>
Signed-off-by: Luis Martínez de Bartolomé Izquierdo <lasote@gmail.com>
 2015-01-08 16:24:52 +01:00
Doug Davis b7cb29137b Move docs on the build API out of 'misc' and under 'Images' section 
It seems odd to have such an important API hidden under 'misc'.
While in there I noticed that during the "-f Dockerfile" PR I changed
the query param from f to dockerfile and missed this one spot in the docs.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-01-07 20:27:09 -08:00
Jan Koprowski 66387aee59 Specify ENV variables are also used for CMD. 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-01-07 10:07:44 -08:00
Sven Dowideit f65b781d21 Merge pull request #9933 from cpuguy83/fix_api_docs_for_info 
doc: Update API docs to reflect correct values for /info
 2015-01-07 14:26:28 +10:00
Doug Davis eb3ea3b43c Allow for Dockerfile to be named something else. 
Add a check to make sure Dockerfile is in the build context
Add docs and a testcase
Make -f relative to current dir, not build context

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-01-06 16:33:26 -08:00
Brian Goff cc3bf34c78 Update API docs to reflect correct values for /info 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-01-06 15:35:45 -08:00
Michael Crosby 6d780139c4 Merge pull request #8748 from duglin/Issue8330 
Have .dockerignore support Dockerfile/.dockerignore
 2015-01-06 13:47:42 -08:00
Doug Davis 6d801a3caa Have .dockerignore support Dockerfile/.dockerignore 
If .dockerignore mentions either then the client will send them to the
daemon but the daemon will erase them after the Dockerfile has been parsed
to simulate them never being sent in the first place.

an events test kept failing for me so I tried to fix that too

Closes #8330

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-01-06 10:57:48 -08:00
Jessie Frazelle 2389c29556 Merge pull request #9927 from LK4D4/carry_of_9925 
Fixed minor typo
 2015-01-06 09:54:03 -08:00
Christian Stefanescu 32ac770f75 Fixed minor typo 
Signed-off-by: Christian Stefanescu <st.chris@gmail.com>
 2015-01-06 09:52:21 -08:00
Jessie Frazelle 0bc2222b39 Merge pull request #9920 from SvenDowideit/publish-all-maps-to-random-ports 
Explicitly mention that '-P' maps to random ports
 2015-01-06 09:39:50 -08:00
Dan Walsh a2b529ead2 --help option and help command should print to stdout not stderr 
--help and help are successful commands so output should not go to error.

    QE teams have requested this change, also users doing docker help | less
    or docker run --help | less would expect this to work.

    Usage statement should only be printed when the user asks for it.
    Errors should print error message and then suggest the docker COMMAND --help
    command to see usage information.

    The current behaviour causes the user to have to search for the error message
    and sometimes scrolls right off the screen.  For example a error on a
    "docker run" command is very difficult to diagnose.

    Finally erros should always exit with a non 0 exit code, if the user
    makes a CLI error.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-01-06 13:40:14 +01:00
Sven Dowideit 7b2331061e Explicitly mention that '-P' maps to random ports 
as noted in https://github.com/boot2docker/boot2docker/issues/690

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2015-01-06 17:01:10 +10:00
Sven Dowideit d1e5078f31 Add @ArikaChen's tip for using HTTPS proxy to pull 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2015-01-06 15:37:07 +10:00
Sven Dowideit ceedaceb5c Merge pull request #9884 from flowlo/patch-1 
doc: Standardise JSON examples
 2015-01-06 15:32:04 +10:00
Alexander Morozov 25f8c26640 Merge pull request #9097 from brahmaroutu/publish_ports_8899 
add ability to publish range of ports
 2015-01-05 14:05:47 -08:00
Lorenz Leutgeb 975f5b0c28 doc: Broaden JSON standardisation by patching 
This is:

    git format-patch -1 --stdout HEAD \
    | patch -p1 docs/sources/reference/api/docker_remote_api_v1.*.md

Applying the changes I initially made on the docs for v1.15 to all
other versions led to acceptable results.

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
 2015-01-05 11:45:10 +01:00
Lorenz Leutgeb e583cc1eb4 doc: Try to standardise JSON examples 
Fixed:
 * Invalid JSON
 * Inconsistent spacing at colon

Expression for binary data streams (line 468 vs. 1474) remain inconsistent.
Could fix that too, if you like.

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
 2015-01-03 18:20:59 +01:00
Daehyeok Mun fc7f055096 Add list of events in remote API docs 
Add exec create and exec start to list of events in remote API docs

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
 2015-01-03 20:40:25 +09:00
Nathan Hsieh 1aac999f70 updated docs with information regarding search pagination 
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
 2015-01-02 16:21:51 -08:00
Srini Brahmaroutu 2338a9cf5a add ability to publish range of ports 
Closes #8899
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-01-02 23:21:26 +00:00
Nathan Hsieh 686585f33a updated search api docs to include pagination changes 
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
 2015-01-02 13:01:28 -08:00
Fred Lifton d7f72188ff Merge pull request #9848 from SvenDowideit/add-restart-policy-delay-docs 
Document that there is a delay before the --restart policy restart, and ...
 2014-12-31 12:13:21 -08:00
Sven Dowideit 1d4a138670 Talk up the 1.4 change to initialise volumes at time 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2014-12-30 13:08:53 +10:00
Sven Dowideit 35873e747d Document that there is a delay before the --restart policy restart, and that its double the last one 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2014-12-30 12:36:04 +10:00
Alexander Morozov 12fef2d8df Merge pull request #9800 from vieux/execIDs_inspect 
Add ExecIDs to docker inspect
 2014-12-29 15:32:33 -08:00
Victor Vieux bbb92e1436 add docs 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-12-24 00:12:35 +00:00
Phil Estes 44cab4a4ff Add "OOM killed" event based on OOM state information 
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2014-12-23 18:22:31 -05:00
Jean-Tiare Le Bigot 800a8e896e start new API v1.17 docs 
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr>
 2014-12-22 09:01:33 +01:00
Alexander Morozov 364720b5e7 Merge pull request #9635 from duglin/Issue3936 
Allow for relative paths on ADD/COPY
 2014-12-18 06:58:50 -08:00
Doug Davis f21f9f856e Allow for relative paths on ADD/COPY 
Moved Tianon's PR from: https://github.com/docker/docker/pull/7870
on top of the latest code

Closes: #3936

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-12-18 05:13:04 -08:00
Fred Lifton f2b89166cf Merge pull request #9683 from SvenDowideit/docker-exec-error-when-paused 
Update the documentation for #9356 fix
 2014-12-17 17:04:25 -08:00
Fred Lifton 5df189a1b0 Merge pull request #9682 from SvenDowideit/scottstamp-stale-links-pr-carry 
Scottstamp stale links pr carry
 2014-12-17 16:03:55 -08:00
Fred Lifton 6afe5bf9ed Additions for 1.4.1 release 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2014-12-16 17:40:02 -08:00
Alexander Morozov f538e4be6b Merge pull request #9652 from yadutaf/master 
Set HTTP upgrade headers when hijacking connection
 2014-12-16 16:21:29 -08:00
Jean-Tiare Le Bigot afb06a3ce2 Update connection hijacking documentation with HTTP Upgrade Headers 
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr>
 2014-12-17 00:22:06 +01:00
James Turnbull 92d24e3b7c Merge pull request #9651 from kdomanski/filter_docs 
Document container list filtering in API docs
 2014-12-16 01:38:49 -05:00
Sven Dowideit c9ca5c4dd3 Update the documentation for #9356 fix 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2014-12-16 15:25:15 +10:00
Sven Dowideit fbb9223b1a add Scott's link checker script, and fix what it finds 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2014-12-16 14:46:25 +10:00
Brian Goff d44c9f9147 Fix volumes-from/bind-mounts passed in on start 
Fixes #9628
Slightly reverts #8683, HostConfig on start is _not_ deprecated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2014-12-15 16:51:15 -05:00
Kamil Domanski 51da97628a Add available filters for containers, images and events to API docs. 
Signed-off-by: Kamil Domański <kamil@domanski.co> (github: kdomanski)
 2014-12-15 16:51:29 +01:00
Kamil Domanski 37bdb05615 Add container list filtering to API docs. 
Signed-off-by: Kamil Domański <kamil@domanski.co> (github: kdomanski)
 2014-12-15 16:50:56 +01:00
James Turnbull eba451b659 Merge pull request #9566 from jfrazelle/btrfs-overlayfs 
add note to docs about overlay + btrfs unsupported
 2014-12-11 09:32:10 +11:00
Jessica Frazelle 340ea25ac1 add note to docs about overlay + btrfs 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-12-10 14:29:41 -08:00
Michael Crosby fb810d18bd Merge pull request #9318 from shishir-a412ed/doc-cpu-share 
Enhanced description for 'docker run' command, -c/--cpu-shares flag
 2014-12-09 17:21:09 -08:00
Arnaud Porterie 67e3ddb75f Forbid client piping to tty enabled container 
Forbid `docker run -t` with a redirected stdin (such as `echo test |
docker run -ti busybox cat`). Forbid `docker exec -t` with a redirected
stdin. Forbid `docker attach` with a redirect stdin toward a tty enabled
container.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2014-12-09 14:30:49 -08:00
shishir-a412ed 2597bffe9a Added description for 'docker run' command, -c/--cpu-shares flag 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2014-12-09 09:55:56 -05:00
Fred Lifton 03d1622ab8 Merge pull request #9522 from SvenDowideit/add-some-cap-add-examples 
Add some cap add examples
 2014-12-08 15:50:25 -08:00
Arnaud Porterie 12252e39a0 Merge pull request #9489 from crosbymichael/info-root 
Return docker's root dir in docker -D info
 2014-12-08 09:05:00 -08:00
Michael Crosby 654da4e151 Return docker's root dir in docker -D info 
This adds the docker daemon's root directory to docker info when running
in debug mode.  This allows the user to view the root directory where
docker is writing and storing state.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-12-05 12:13:25 -08:00
Michael Crosby 2525a04594 Merge pull request #9493 from SvenDowideit/note-lxc-conf-pitfall 
Note that using -lxc-conf to change things Docker manages has pitfalls
 2014-12-05 11:16:19 -08:00
Sven Dowideit 5f2000944b Add a fuse example, combining both SYS_ADMIN and --device 
inspired by #9448 and #9487

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2014-12-05 16:42:48 +10:00
Sven Dowideit 48a596a804 add --cap-add=NET_ADMIN to make a new network device 
inspired by #9452

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2014-12-05 16:30:54 +10:00
Sven Dowideit 8dfcbf62ed Merge pull request #9272 from SvenDowideit/pr_out_try_out_a_different_phrase_for_icc 
Try out a different phrase for --icc
 2014-12-05 16:22:51 +10:00
James Turnbull ebf89cf219 Merge pull request #9507 from jsternberg/docker-build-docs-formatting-fix 
Fixing docs formatting for the forcerm flag on docker build
 2014-12-04 21:54:14 -08:00
Sven Dowideit e01baa6be7 Auto-update documentation from the output of the cli. 
I've re-jigged the run man page so that each option's text begins with the
cli's help text for that flag, and then ay subsequent lines in the man page
are carried forward.

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-12-05 10:43:38 +10:00
Jonathan A. Sternberg eb7d646a44 Fixing docs formatting for the forcerm flag on docker build 
Signed-off-by: Jonathan A. Sternberg <jonathansternberg@gmail.com>
 2014-12-04 12:35:31 -05:00
Sven Dowideit b91d330088 Note that using -lxc-conf to change things Docker manages has pitfalls 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-12-04 11:49:06 +10:00
James Turnbull e15ffa45a6 Merge pull request #9486 from ClusterHQ/9484-fromSrc-api-docs 
Document fromSrc more clearly
 2014-12-03 20:31:44 -05:00
Jessie Frazelle 67fda33197 Merge pull request #9089 from cpuguy83/8942_create_volumes_on_create 
Initialize volumes when container is created
 2014-12-03 15:42:09 -08:00
Jean-Paul Calderone 0888c1880f Update the most recent released version of the docs as well. 
Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com>
 2014-12-03 17:14:08 -05:00
Jean-Paul Calderone 826f809d09 Talk about URL support and the real meaning of `-` in the latest `fromSrc` API documentation. 
Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com>
 2014-12-03 17:13:48 -05:00
Michael Crosby 5d49d2bb7a Merge pull request #9426 from lhuard1A/overlay_rename 
Rename overlayfs to overlay
 2014-12-03 10:57:42 -08:00
Lénaïc Huard d680ca5c96 Rename the overlay storage driver 
so that docker is started with `docker -d -s overlay` instead of `docker -d -s overlayfs`

Signed-off-by: Lénaïc Huard <lhuard@amadeus.com>
 2014-12-03 13:57:23 +01:00
Sven Dowideit 070a519a9b fixes as per feedback 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-12-03 12:46:23 +10:00
Sven Dowideit 94d67d5d5b Try out a different phrase for --icc 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-12-03 12:46:23 +10:00
Michal Minar a2aa78f6ec Doc: described storage-driver options in cli reference 
Documented --storage-opt=[] option in cli reference page. Content taken
from:

  daemon/graphdriver/devmapper/README.md

Signed-off-by: Michal Minar <miminar@redhat.com>

Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com> (github: SvenDowideit)
 2014-12-03 12:46:16 +10:00
Michal Minar a61a4a3188 Man: describe --icc option better 
Current description is misleading. It make an impression the --icc=false
prevents containers to talk with each other.

Signed-off-by: Michal Minar <miminar@redhat.com>

Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com> (github: SvenDowideit)
 2014-12-03 12:46:16 +10:00
Fred Lifton 315520b845 Merge pull request #9430 from sindhus/patch-3 
Fix dead link cli.md
 2014-12-02 16:06:48 -08:00
Sven Dowideit b487d2f2ff Merge pull request #9330 from TomasTomecek/master 
docs: man docker-images: inconsistent naming
 2014-12-02 11:42:29 +10:00
Sindhu S 7754ef1f06 Fix dead link build.md 2014-12-01 19:35:58 +05:30
Sindhu S b1dc0db56a Fix dead link cli.md 2014-12-01 19:28:02 +05:30
Neal McBurnett 4bf72613fe Fixes #9418 Docker Registry now open source 
Signed-off-by: Neal McBurnett <neal@mcburnett.org>
 2014-11-30 21:12:57 -07:00
Alexander Boyd eb8e84c48a Correct inaccuracy in docker pull documentation 
Signed-off-by: Alexander Boyd <alex@opengroove.org>
 2014-11-29 23:36:19 -07:00
James Turnbull 353ff40181 Merge pull request #9332 from jacobat/patch-1 
Update documentation for EXPOSE
 2014-11-29 09:27:49 -05:00
Jacob Atzen 8432224f0e Update documentation for EXPOSE 
The documentation for EXPOSE seems to indicate, that EXPOSE is only relevant in
the context of links, which is not the case.

Signed-off-by: Jacob Atzen <jatzen@gmail.com>
 2014-11-29 15:18:18 +01:00
Fred Lifton 2c97cc3995 Merge pull request #9227 from SvenDowideit/add-client-ip-to-hosts 
Add an example of how to add your client IP to the container hosts file
 2014-11-28 17:44:11 -08:00
Tomas Tomecek 095027944f docs: man docker-images: inconsistent naming 
Synopsis is mentioning "NAME" while description is describing "REPOSITORY".

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2014-11-28 08:57:07 +01:00
Sven Dowideit 54050083d1 Add an example of how to add your client IP to the container hosts file 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-11-27 16:36:55 +10:00
James Turnbull 9e56c614a1 Merge pull request #9368 from msteinert/builder-md-typo 
Fix a small typo
 2014-11-26 22:39:19 -05:00
Sven Dowideit 498f208ade Explain what the VIRTUAL SIZE means 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-11-27 12:06:40 +10:00
Michael Steinert 8b881df9b1 Fix a small typo 
Signed-off-by: Michael Steinert <mike.steinert@gmail.com>
 2014-11-26 13:09:44 -06:00
Jessie Frazelle 00c2a8f323 Merge pull request #9208 from duglin/Issue8703 
Add support for docker exec to return cmd exitStatus
 2014-11-25 18:03:51 -08:00
Jessie Frazelle 9160e01cef Merge pull request #8893 from vieux/filter_events 
Events filtering (daemon side)
 2014-11-25 17:52:27 -08:00
Doug Davis 90928eb114 Add support for docker exec to return cmd exitStatus 
Note - only support the non-detached mode of exec right now.
Another PR will add -d support.

Closes #8703

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-11-25 17:49:25 -08:00
Michael Crosby df7c22dd23 Merge pull request #9162 from aidanhs/patch-1 
Allow git@ urls for more than just github
 2014-11-24 14:51:52 -08:00
Jessie Frazelle 39284be960 Merge pull request #9263 from cpuguy83/docs_cleanup_exec_api 
Cleanup exec API docs and available params
 2014-11-24 13:35:45 -08:00
Aidan Hobson Sayers c7e4cc4a53 Allow git@ prefixes for any hosted git service 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2014-11-24 20:49:54 +00:00
Michael Crosby b4757445ae Merge pull request #9301 from krivenok/master 
Fixed typo in documentation.
 2014-11-24 12:27:56 -08:00
Michael Crosby 5e19ecf25c Merge pull request #9281 from unclejack/build_pull_flag 
build: add pull flag to force image pulling
 2014-11-24 12:10:45 -08:00
Dmitry V. Krivenok 5deedef42c Made wording a bit more generic. 2014-11-24 21:22:54 +03:00
Richard Metzler 91a8b916b0 Empty Line should fix Markdown unordered list 
Without the line break the list would render as one single paragraph.
 2014-11-23 23:57:43 +01:00
Dmitry V. Krivenok 745e3f77a1 Fixed typo in documentation. 2014-11-23 22:59:35 +03:00
Jessie Frazelle c59b308b6b Merge pull request #9223 from vbatts/vbatts-overlay_notfound 
overlayfs: more helpful output when not supported
 2014-11-21 19:58:01 -08:00