Nicole Thomas
904324d7b3
Reorganize deprecation docs into sections in Carbon release notes ( #35307 )
...
This makes all of the deprecations more readable and easier to find
things that have been deprecated in the Carbon release.
2016-08-09 13:20:12 -06:00
twangboy
098a6bc538
Fix typos in documentation
2016-08-09 17:27:45 +00:00
twangboy
0a5d804a40
Update documentation for new installer
2016-08-09 17:23:48 +00:00
rallytime
14454eab72
Add cloud deprecations to release notes
...
And give cloud deprecations their own section to make things
easy to spot.
2016-08-08 19:47:56 -06:00
rallytime
8f2058219e
Remove private_ip option in linode driver
...
This option has been deprecated - use assign_private_ip instead.
2016-08-08 19:25:18 -06:00
Mike Place
715dc14b9b
Merge pull request #35247 from rallytime/carbon-deprecations
...
Remove some of the things that are deprecated in Carbon
2016-08-09 09:00:27 +09:00
rallytime
de4b33f2e1
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/client/ssh/__init__.py
- salt/client/ssh/shell.py
- salt/config/__init__.py
- salt/grains/core.py
- salt/utils/gitfs.py
2016-08-08 12:34:23 -06:00
rallytime
2b4c156df1
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/client/ssh/__init__.py
- salt/grains/core.py
- salt/output/highstate.py
2016-08-08 11:15:43 -06:00
Thomas S Hatch
f8158124d5
Merge pull request #35211 from cachedout/issue_31074
...
Alternative sudo users for salt-ssh
2016-08-08 09:40:55 -06:00
Mike Place
f004b831d2
Merge pull request #35178 from cro/proxy_cache_fix2
...
Add append_minionid_config_dirs option
2016-08-07 07:21:14 +09:00
Mike Place
104116f464
Add release notes and include entry about disk.wipe fix
2016-08-07 06:58:55 +09:00
rallytime
9216e8ad93
Remove deprecated vsphere cloud driver in Carbon release
...
This driver has been marked for deprecation and removal in Carbon.
Release notes were updated accordingly.
Users will need to use the vmware cloud driver instead.
2016-08-05 16:16:12 -06:00
rallytime
51d22112d7
Docs cleanup
2016-08-05 16:02:37 -06:00
rallytime
4d6b214380
Remove deprecated zpool_list function in zpool module
2016-08-05 15:47:52 -06:00
rallytime
a0dd435304
Remove carbon deprecations from the virt runner
...
Several functions were removed as well as any references to the "hyper"
kwarg. "host" should be used instead.
Release notes were also updated with this information.
2016-08-05 15:08:43 -06:00
rallytime
8f76d92b72
Remove use of always kwarg in pgkbuild.built state: deprecated
...
This has been deprecated and marked for removal in Carbon. Also added
a note to the release notes about this change. Use 'force' instead.
2016-08-05 14:48:54 -06:00
rallytime
c99c7969c3
Remove deprecated created, started, and cloned functions from lxc state
...
Also updates the Carbon release notes to include these removals and
includes which functions replace the deprecated functions
2016-08-05 14:26:46 -06:00
rallytime
5dad736f3c
Add hash_hostname, iam utils funcs, and ip_in_subnet deprecations to Carbon release notes
2016-08-05 13:07:18 -06:00
Nathan Gould
3683f9a715
Improve clarity of requisite docs
...
Docs should stick to the terms "required" vs. "dependent", where required means the state that has to happen first, and dependent means the state that relies on the required state.
2016-08-04 15:14:39 -04:00
Mike Place
6f53232e6d
Better error handling and a workaround for group mismatch.
2016-08-05 03:41:36 +09:00
Mike Place
5b56a4acf7
Docs
2016-08-05 03:24:18 +09:00
Jonathan Ballet
1642dba5d1
doc: fix broken links in the test documentation page
2016-08-04 16:56:42 +02:00
Thomas S Hatch
da6107647d
Add some release notes on features for carbon ( #35188 )
...
* Add initial relnotes for ceph, docker and thorium stuff
* more
2016-08-03 17:01:41 -06:00
rallytime
df5f3d45a1
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/minion.py
2016-08-03 15:06:17 -06:00
C. R. Oldham
84cc7d67c0
Add documentation for append_minionid_config_dirs.
2016-08-03 12:36:37 -06:00
rallytime
a64026fc99
Start release notes for 2016.3.3
2016-08-02 15:47:17 -06:00
Jacob Hammons
f4d869fb0f
doc version updated to 2016.3.2 ( #35147 )
...
updated the navigation headings
2016-08-02 14:21:52 -06:00
Jacob Hammons
4967ed275f
doc version update to 2015.8.11, updates to release notes ( #35145 )
2016-08-02 13:55:32 -06:00
rallytime
72a116b731
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/states/pkg.py
2016-08-02 13:05:36 -06:00
Mike Place
222449cd0e
Merge pull request #34920 from cachedout/key_cache
...
Key cache
2016-08-02 12:11:18 -06:00
rallytime
0d5f0b6016
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-08-02 10:40:26 -06:00
Mircea Ulinic
2d2407f036
http_logstash engine
2016-08-02 12:11:04 +00:00
Mike Place
b91bccaae5
Merge pull request #35086 from ankitforcode/Adding_digital_ocean_ssh_interface_feature
...
Adding Digital Ocean ssh_interface feature
2016-08-02 01:54:01 -06:00
Erik Johnson
d54d14c6cf
Add documentation for runner_returns config option
2016-08-01 23:04:05 -05:00
Thomas S Hatch
307d5a17b2
Branding, it matters
2016-08-01 16:01:14 -06:00
Thomas S Hatch
9c1bb5c3ff
Merge pull request #35062 from thatch45/develop
...
Initial Docker sls tutorial
2016-08-01 15:57:39 -06:00
Thomas S Hatch
d3a5e13ef3
like this you think?
2016-08-01 15:55:46 -06:00
Thomas S Hatch
c7ea94ea01
it is no secret, I don't spell too well :)
2016-08-01 15:06:40 -06:00
Thomas S Hatch
64d6282135
SUSE, not Suse, not SuSE
2016-08-01 15:00:37 -06:00
Thomas S Hatch
b37e81a6cf
clarify on image used
2016-08-01 14:44:32 -06:00
Thomas S Hatch
823dc8d586
fix typo
2016-08-01 14:23:07 -06:00
rallytime
a2fbbebe86
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/master.py
- salt/modules/saltutil.py
- salt/states/saltmod.py
2016-08-01 13:42:36 -06:00
rallytime
fbaff3e98e
Update 2016.3.0 release notes with repo.saltstack.com Xenial pkg availability
...
Refs #33870
2016-08-01 11:14:53 -06:00
Mike Place
9bf9edb0e0
Merge pull request #35071 from terminalmage/issue35065
...
Detect nodegroup lists with no compound syntax as L@host1,host2,host3...
2016-08-01 06:52:40 -06:00
Ankit Agarwal
3b668158c6
Adding feature ssh_interface for Digital Ocean Cloud Config
2016-07-31 23:32:04 +05:30
Duncan Mac-Vicar P
9bfb3d85f1
add links to (open)SUSE family of images and build generation tools
2016-07-31 10:37:18 +02:00
Erik Johnson
723b536eae
Add documentation, release notes mention for new feature
2016-07-29 19:28:52 -05:00
Thomas S Hatch
82228b47d9
Initial Docker sls tutorial
2016-07-29 10:32:10 -06:00
Mike Place
bd5e2a3ed3
Merge pull request #35033 from UtahDave/fix_win_cpu_model
...
Fix cpu_model grain on Windows to actual CPU model
2016-07-29 10:06:25 -06:00
Mike Place
4fe3397a41
Merge pull request #34921 from tonybaloney/quickstart
...
Introduce a template system for extending SaltStack open
2016-07-28 22:38:10 -06:00
rallytime
bdcc81a384
Start release notes file for 2015.8.12
2016-07-28 17:16:49 -06:00
David Boucha
2fe747c05c
add release note about the cpu_model grain change
2016-07-28 15:35:55 -06:00
Mike Place
404833e51b
Merge pull request #34969 from fdamstra/Add_multi_event_return
...
Adds support for multiple server-side event_returners.
2016-07-28 13:39:52 -06:00
rallytime
fde7e0f4c5
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/utils/schedule.py
2016-07-28 11:08:14 -06:00
Anthony Shaw
5b2a97e22b
added docs
2016-07-28 11:33:42 +10:00
Anthony Shaw
1280940079
linting fixes
2016-07-28 09:13:22 +10:00
Mike Place
92e69310c9
Merge pull request #34993 from terminalmage/docs
...
Add docs on utility modules, improve module writing docs, update Carbon release notes
2016-07-27 13:12:30 -06:00
Mike Place
1534b143e2
Merge pull request #34772 from kerick/ddns-port-work
...
ddns: Add support for user defined nameserver port/TSIG key algorithm
2016-07-27 12:05:40 -06:00
Erik Johnson
82ebfc6b31
Improve Carbon release docs
2016-07-27 12:15:28 -05:00
Erik Johnson
6ae5667c23
Clarify usage of module.run state in states documentation
2016-07-27 11:57:55 -05:00
Erik Johnson
a5c78d626e
Improve accuracy and formatting of execution module docs
2016-07-27 11:57:12 -05:00
Erik Johnson
4538b9e9d4
Add utility modules doc page to the TOC
2016-07-27 11:56:49 -05:00
Erik Johnson
4e804217e3
Add documentation on utility modules
2016-07-27 11:56:41 -05:00
rallytime
a2aae987a6
Update release notes with new changes
2016-07-27 09:53:19 -06:00
Fred Damstra
8b56d76490
Adds support for multiple server-side event_returners.
...
The master config 'event_return' can now take a list
of returners which will each be called in turn. It
continues to function with the previous configuration
format of a single item.
2016-07-27 11:41:59 -04:00
Anthony Shaw
dac5cec503
start doc layout
2016-07-27 19:56:35 +10:00
Mike Place
9cd052f07f
Merge pull request #34959 from terminalmage/utils-in-runners
...
Make __utils__ dunder available in runner funcs
2016-07-26 16:13:35 -06:00
Erik Johnson
7b22b6b0e6
Add new runner feature to Carbon release notes
2016-07-26 12:29:59 -05:00
rallytime
76e8dd974a
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/state.py
- tests/integration/__init__.py
- tests/integration/wheel/key.py
2016-07-26 11:05:24 -06:00
Denys Havrysh
0faa490991
Fix job scheduling using `when
parameter (by
python-dateutil
`)
2016-07-26 17:37:28 +03:00
Mike Place
1ca13c006a
Add note in scaling doc
2016-07-24 11:54:21 -06:00
Mike Place
caf0361bc1
Merge pull request #34807 from terminalmage/issue2707
...
Feature addition: preserve mode in file states
2016-07-22 16:43:31 -06:00
rallytime
9227c3dd26
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- - - - - - - - - conf/master
2016-07-21 13:39:21 -06:00
rallytime
1a9d6eee15
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/grains/core.py
- salt/state.py
- tests/unit/grains/core_test.py
2016-07-21 12:06:25 -06:00
Nicole Thomas
7423177491
Update 2016.3.2 release notes ( #34850 )
2016-07-21 11:18:31 -06:00
Thomas S Hatch
94df6f8dc6
Add a clarifying note on Saltfile
2016-07-21 11:09:28 -06:00
Nicole Thomas
59fffa86bc
Update release notes for 2016.3.2 ( #34848 )
2016-07-21 10:02:01 -06:00
Thomas S Hatch
6c35d88268
Fix #34648 ( #34828 )
2016-07-20 14:49:52 -06:00
Erik Johnson
087500bde7
Add new file mode preservation feature to carbon release notes
2016-07-20 15:33:11 -05:00
Jayson Cofell
9c330fe492
Fix port arguments
2016-07-20 06:29:56 -05:00
Jayson Cofell
7756d7af5e
Modify port argument position/documentation
2016-07-19 13:28:12 -05:00
rallytime
39bc093ee9
Merge branch '2016.3' into 'develop'
...
No conflicts.
2016-07-19 10:31:07 -06:00
C. R. Oldham
bf4dc079df
Document fqdn_base.
2016-07-18 15:49:59 -06:00
Jacob Hammons
c3ae64c054
Updates man pages ( #34756 )
...
adds link to all tutorials to using salt section
Refs #33923
2016-07-18 15:36:50 -06:00
Jayson Cofell
fc6409b69a
Update ddns runner documention for port, TSIG key algorithm, and timeout
2016-07-18 15:18:55 -05:00
Jayson Cofell
90e1f514e1
Update ddns module documentation
2016-07-18 15:11:58 -05:00
rallytime
ead3eb1606
Update azure lib dep to match the one in cloud.clouds.msazure
...
Refs #27980
2016-07-18 11:26:36 -06:00
rallytime
d679c09e65
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/config/__init__.py
- salt/utils/parsers.py
- tests/unit/config/config_test.py
2016-07-18 10:34:03 -06:00
rallytime
7d106c78f0
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-07-18 09:45:00 -06:00
Mike Place
c6700a219a
Document how to test for the existence of a log message ( #34738 )
2016-07-18 09:12:13 -06:00
Mike Place
abf5b976ed
Merge pull request #34722 from rallytime/fix-34630
...
Various spelling fixes
2016-07-16 13:49:54 -06:00
rallytime
b9e0bd1918
Merge branch '2016.3' into 'develop'
...
No conflicts.
2016-07-16 13:24:10 -06:00
rallytime
cca9446c37
Various spelling fixes
...
Fixes #34630
2016-07-16 13:17:09 -06:00
rallytime
9c803d05a5
Add output_file option to master config docs
...
Fixes #34703
2016-07-16 12:45:55 -06:00
rallytime
c2130d5a04
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-07-16 12:29:54 -06:00
Denys Havrysh
a8b79e8dc1
event_return_*
master opts: update doc and config examples
...
Signed-off-by: Denys Havrysh <Denys.Gavrysh@gmail.com>
2016-07-15 15:27:48 +03:00
rallytime
f20e78b534
Merge branch '2016.3' into 'develop'
...
No conflicts.
2016-07-14 15:35:21 -06:00
Justin Findlay
aaa6f7d80a
update 2015.8.11 release notes ( #34682 )
2016-07-14 15:23:26 -06:00
rallytime
0c566dce89
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-07-14 14:06:42 -06:00
Mike Place
07840714c5
Merge pull request #34608 from pass-by-value/cassandra_cql_returner_opts
...
Add support for more options to Cassandra CQL returner
2016-07-14 09:06:43 -06:00
Fred Damstra
d75276f9d9
Added documentation link for rawfile_json returner.
2016-07-13 20:34:27 -04:00
rallytime
49f40e9d99
Merge branch '2016.3' into 'develop'
...
Conflicts:
- doc/conf.py
- doc/topics/reactor/index.rst
- tests/integration/__init__.py
2016-07-12 16:13:56 -06:00
rallytime
f734afd0b0
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/modules/aptpkg.py
- tests/integration/__init__.py
2016-07-12 14:29:35 -06:00
Jacob Hammons
5e2ddb5eb0
Adds a mock required for the network settings beacon
2016-07-12 13:08:46 -06:00
Aditya Kulkarni
857208394f
Add support for more options to Cassandra CQL returner
2016-07-12 11:50:01 -04:00
Loren Gordon
bfe0dd0b8a
Clarifies the proper way to reference states
...
It seems in some situations, or in some earlier version, using a `/`
to reference sls files in subdirectories did work. However, because
of the inconsistency it caused occasional confusion. This updates the
tutorial to focus on the canonical `.` notation, which always works.
2016-07-12 07:58:27 -04:00
Christer Edwards
220a3ae53f
Update freebsd.rst
...
Updated FreeBSD installation instructions to remove ``priority`` definition.
(This, I believe, should address an issue submitted in saltstack/salt-bootstrap/issues/908)
2016-07-10 10:22:30 -06:00
Erik Johnson
ae38c874da
Add a bunch of documentation on getting files from other environments ( #34560 )
...
* Remove :members: from fileserver docs pages
These functions can never be invoked directly from the CLI, so it is
pointless to include them in the documentation.
* Rename section
* Add docs page clarifying how to get files from different environments
* Add reminder that file_roots can be specified for masterless salt
* Link to the new environments page from the states tutorial
* Add information on pulling reactor configs from non-base environments
* Add examples of querystring syntax to cp module
2016-07-08 17:15:27 -04:00
rallytime
86b7c71e09
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/modules/glusterfs.py
- salt/states/pkg.py
2016-07-07 13:37:58 -06:00
rallytime
27988dde48
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- doc/ref/configuration/minion.rst
2016-07-07 12:31:12 -06:00
Mike Place
63f0451041
Merge pull request #34498 from rallytime/bootstrap-tutorial-doc-fix
...
Use -O in the wget example in the bootstrap tutorial for the develop branch
2016-07-07 10:30:46 -06:00
Erik Johnson
8722257b82
Improve top file merging documentation ( #34505 )
...
* Add top file config params to minion config file documentation
* Improve documentation on top file merging behavior
* Add recommendation on changing top_file_merging_strategy
* Improve the log message warning of multiple top files
2016-07-07 12:04:27 -04:00
rallytime
23c5739c3b
Use -O in wget develop example in bootstrap tutorial
2016-07-06 15:23:39 -06:00
rallytime
2b307b7ea1
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/states/file.py
- tests/unit/states/file_test.py
2016-07-06 09:12:25 -06:00
rallytime
e4a8c585d0
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/states/pkg.py
2016-07-05 13:11:32 -06:00
C. R. Oldham
0a264597ca
Forgot reference to inotify ( #34455 )
2016-07-05 12:32:49 -04:00
rallytime
d850167efd
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/minion.py
2016-06-30 16:11:04 -06:00
rallytime
8398de0baf
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-06-30 16:08:57 -06:00
Mike Place
d4c04e07f0
Merge pull request #34358 from thatch45/thor_more
...
Add Thorium states to auto clean out old keys
2016-06-30 11:37:32 -07:00
C. R. Oldham
6cce575d40
Clarify that salt-cloud doesn't get installed by bootstrap
2016-06-30 10:27:52 -06:00
Thomas S Hatch
c6882ca974
suggest a sane default interval
2016-06-30 09:45:17 -06:00
Nicole Thomas
70e1f18b89
Beacon network docs ( #34386 )
...
* Add beacons/network_settings to doc build
* Add a versionadded tag for the beacons.network_settings module
2016-06-30 11:12:55 -04:00
Joseph Hall
fb3f05dfd7
Update dependency docs for SPM ( #34385 )
...
* Update dependency docs for SPM
* Typo
2016-06-30 11:12:26 -04:00
Thomas S Hatch
29b6253b3e
Add all the things I always forget :)
2016-06-29 09:47:34 -06:00
Thomas S Hatch
d4d79d95ea
update docs to a workign example
2016-06-28 21:19:52 -06:00
rallytime
cc83fa151a
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/modules/status.py
- salt/utils/__init__.py
- tests/unit/modules/boto_vpc_test.py
- tests/unit/modules/mount_test.py
- tests/unit/states/boto_vpc_test.py
2016-06-28 17:34:27 -06:00
rallytime
f9ab8ba46d
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-06-28 14:26:24 -06:00
jacobhammons
0c60feac02
Doc clarifications to file modules, addition of new profile
log level to docs, fixed example in dnsmasq ( #34323 )
...
Refs #34249
Refs #34261
Refs #33694
Refs #34247
2016-06-28 12:03:59 -04:00
Nicole Thomas
76c8bb0d1c
Use correct feature branch name ( #34317 )
2016-06-27 18:26:19 -04:00
rallytime
f44a0543fe
Fix test example in integration testing docs
...
The example is out of date compared to the actual test it's modeling.
Notably, the self.state_result() function doesn't exist.
2016-06-27 10:22:15 -06:00
Alexander Krasnukhin
a8514d9058
Update correct default value for spm_build_dir
...
Looks like docs have wrong default directory for `spm_build_dir` config option. It is actually `/srv/spm_build`.
2016-06-27 13:11:23 +02:00
Seth House
6639b347d0
Add 'delete' key event to list ( #34189 )
2016-06-22 11:23:49 -04:00
rallytime
8479c45728
Merge branch '2016.3' into 'develop'
...
No conflicts.
2016-06-21 17:29:44 -06:00
rallytime
318c2ed6a1
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/cli/salt.py
- salt/modules/grains.py
- tests/unit/modules/boto_vpc_test.py
2016-06-21 16:03:31 -06:00
Mike Place
3413c494bd
Merge pull request #34173 from rallytime/fix-34162
...
Update docs to match log_level default
2016-06-21 10:15:53 -07:00
Nicole Thomas
47595d6795
Typo fix ( #34174 )
2016-06-21 12:08:43 -04:00
rallytime
f577681f0b
Update docs to match log_level warning default
...
Fixes #34162
2016-06-21 09:31:59 -06:00
rallytime
73f3e12ce6
Update package dep note to systemd-python for RHEL7 install
...
Fixes #34120
2016-06-20 08:53:42 -06:00
Metin de Vreugd
d1769fb64f
Add timeout to ddns execution module and runner
2016-06-20 11:08:10 +02:00
rallytime
d957c29704
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/master.py
- salt/utils/parsers.py
2016-06-16 17:08:39 -06:00
rallytime
f6bfaede21
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- doc/topics/installation/index.rst
- salt/master.py
- salt/modules/mac_brew.py
- salt/modules/pacman.py
- salt/modules/solarisips.py
- salt/returners/postgres_local_cache.py
- salt/states/apache_module.py
- salt/utils/minions.py
- tests/unit/acl/client_test.py
2016-06-16 16:10:41 -06:00
Thomas S Hatch
dd26d6fd74
Merge pull request #34009 from rallytime/bp-33948
...
Back-port #33948 to 2016.3 + add log message
2016-06-16 15:01:09 -06:00
Anthony Elizondo
2d7ce4cde1
Typo fix ( #34066 )
2016-06-16 15:04:04 -04:00
Jacob Hammons
ce027fd769
Fixes doc refresh bug on chrome mobile.
2016-06-16 12:43:33 -06:00
Thomas S Hatch
bf3e7c83b0
Merge pull request #33837 from lorengordon/masterless-orchestration
...
Support salt.state orchestration in masterless mode
2016-06-16 11:16:53 -06:00
Thomas S Hatch
dd03024931
Merge pull request #34011 from rallytime/bp-33948-2015.8
...
Back-port #33948 and #34009 to 2015.8
2016-06-16 09:41:01 -06:00
rallytime
9d049e28e5
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/modules/win_pkg.py
- salt/states/disk.py
2016-06-15 17:13:26 -06:00
Nicole Thomas
f546a00dc9
Merge pull request #34025 from rallytime/merge-2016.3
...
[2016.3] Merge forward from 2015.8 to 2016.3
2016-06-15 15:41:00 -04:00
Jacob Hammons
cf0d14d6d6
Updated latest version for doc site
2016-06-15 13:23:50 -06:00
Jacob Hammons
43b4a12aa2
Updated latest release version
2016-06-15 13:22:06 -06:00