Commit Graph

8154 Commits

Author SHA1 Message Date
rallytime
776f2ea5d7
Merge branch '2018.3.0rc1' into '2018.3'
Conflicts:
  - salt/pillar/file_tree.py
  - tests/unit/modules/test_yumpkg.py
2018-02-26 11:01:42 -05:00
rallytime
a731047e59
Add man pages for oxygen release 2018-02-23 12:15:13 -05:00
rallytime
79bed6cff1
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/reg.py
  - salt/modules/win_lgpo.py
  - salt/modules/win_path.py
  - salt/modules/win_pkg.py
  - salt/pillar/file_tree.py
  - salt/states/boto3_route53.py
  - salt/states/reg.py
  - salt/utils/win_functions.py
  - tests/unit/modules/test_kubernetes.py
  - tests/unit/modules/test_win_path.py
2018-02-23 09:50:19 -05:00
Nicole Thomas
e6374bf68d
Merge pull request #46149 from rallytime/bp-46145
Back-port #46145 to oxygen.rc1
2018-02-22 16:57:51 -05:00
Erik Johnson
6a8b1ac33a
Document behavior when orchestration runnner invoked with non-orch states
This also replaces some += usage with list.extend for a modest
performance/memory improvement.
2018-02-22 10:49:39 -05:00
Erik Johnson
c77341b544
Rename release notes file to 2018.3.0.rst, add 2018.3.* to release tree 2018-02-21 21:56:54 -06:00
Erik Johnson
1668a489c4
Update refrences to Oxygen codename to 2018.3.0 2018-02-21 21:47:41 -06:00
Denys Havrysh
d8fb051e44
[DOC] Fix code-blocks for reStructuredText 2018-02-21 15:37:57 +02:00
rallytime
4c2f504a85
Merge branch '2016.11' into '2017.7'
No conflicts.
2018-02-20 17:43:33 -05:00
Denys Havrysh
2062fd0e5c
[DOC] Put https link to the formulas doc page 2018-02-19 12:59:00 +02:00
Wedge Jarrad
5a0fe104f7 Fix contributing doc typo 2018-02-18 10:57:28 -08:00
Ch3LL
2a5d855d97
add required arg to dns_check jinja doc example 2018-02-16 10:48:57 -05:00
rallytime
e060a74fd8
Merge branch '2017.7' into 'oxygen'
Conflicts:
  - salt/cloud/clouds/dimensiondata.py
  - salt/config/__init__.py
  - salt/modules/yumpkg.py
  - salt/pillar/ec2_pillar.py
  - salt/utils/docker/__init__.py
  - salt/utils/vault.py
  - tests/integration/states/test_docker_container.py
  - tests/unit/modules/test_yumpkg.py
  - tests/unit/templates/test_jinja.py
  - tests/unit/utils/test_docker.py
2018-02-14 16:31:31 -05:00
rallytime
a06645ce71
Merge branch '2017.7.3' into '2017.7'
Conflicts:
  - doc/topics/releases/2017.7.4.rst
  - salt/utils/vault.py
2018-02-13 13:34:24 -05:00
Ch3LL
ac0baf4b34
Add 2017.7.4 Release Notes with PRs 2018-02-13 11:31:20 -05:00
rallytime
d6c2d0693a
Merge branch 'oxygen.rc1' into 'oxygen'
No conflicts.
2018-02-13 10:54:25 -05:00
Nicole Thomas
069f790b3c
Merge pull request #45944 from cloudflare/netbox-autodoc
Add NetBox module autodoc
2018-02-12 19:01:47 -05:00
twangboy
6d223cffa7
Add tip about passing bogus saltenv 2018-02-12 14:03:31 -07:00
twangboy
87dc554dc3
Add final updates to docs 2018-02-12 14:03:30 -07:00
twangboy
3646d5c897
Fix some docs formatting, add some warnings 2018-02-12 14:03:30 -07:00
Mircea Ulinic
ed69b987cf Add NetBox module autodoc 2018-02-09 09:45:40 +00:00
rallytime
d80547e0b8
Merge branch '2017.7' into 'oxygen'
Conflicts:
  - salt/fileclient.py
  - salt/grains/disks.py
  - salt/modules/cmdmod.py
  - salt/state.py
  - salt/states/file.py
  - salt/utils/gitfs.py
  - salt/utils/win_functions.py
  - tests/integration/modules/test_state.py
  - tests/unit/cache/test_localfs.py
2018-02-08 11:23:31 -05:00
rallytime
e4e4744218
Merge branch '2016.11' into '2017.7'
No conflicts.
2018-02-08 10:42:37 -05:00
Nicole Thomas
3a3f87c16d
Merge pull request #45877 from rallytime/new-release-notes
Add release notes file for 2017.7.4 release
2018-02-08 09:07:42 -05:00
Erik Johnson
b4e24a69e6
Move get_context to salt.utils.stringutils
This avoids circular dependencies when salt.utils.jinja (which is
imported by salt.utils.templates) needs to use get_context()
2018-02-07 02:09:56 -06:00
rallytime
f937e8ba81
Add release notes file for 2017.7.4 release 2018-02-06 09:57:22 -05:00
Nicole Thomas
27ff82f996
Merge pull request #45864 from rallytime/release-note-fix
Remove extraneous ] in release notes for 2016.11.9
2018-02-06 09:31:09 -05:00
rallytime
104a24f244
Remove extraneous ] in release notes for 2016.11.9 2018-02-05 16:34:19 -05:00
Nicole Thomas
cca997d0da
Merge pull request #45788 from rallytime/2017.7.3_docs
[2017.7] Bump latest and previous versions
2018-02-05 10:30:46 -05:00
Erik Johnson
2feaaa3efc
Fix invalid Sphinx lexers in docs
This clears up some warnings when we build the docs, and improves the
syntax highlighting in the docs.
2018-02-02 09:21:07 -06:00
Benjamin Drung
179e8fbe73 doc: Do not mock non-existing __qualname__ attribute
Building the documentation with the Python 3 version of sphinx fails:

$ make -C doc html SPHINXBUILD=/usr/share/sphinx/scripts/python3/sphinx-build
[...]
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/sphinx/cmdline.py", line 296, in main
    app.build(opts.force_all, filenames)
  File "/usr/lib/python3/dist-packages/sphinx/application.py", line 333, in build
    self.builder.build_update()
  File "/usr/lib/python3/dist-packages/sphinx/builders/__init__.py", line 251, in build_update
    'out of date' % len(to_build))
  File "/usr/lib/python3/dist-packages/sphinx/builders/__init__.py", line 265, in build
    self.doctreedir, self.app))
  File "/usr/lib/python3/dist-packages/sphinx/environment/__init__.py", line 556, in update
    self._read_serial(docnames, app)
  File "/usr/lib/python3/dist-packages/sphinx/environment/__init__.py", line 576, in _read_serial
    self.read_doc(docname, app)
  File "/usr/lib/python3/dist-packages/sphinx/environment/__init__.py", line 684, in read_doc
    pub.publish()
  File "/usr/lib/python3/dist-packages/docutils/core.py", line 217, in publish
    self.settings)
  File "/usr/lib/python3/dist-packages/sphinx/io.py", line 55, in read
    self.parse()
  File "/usr/lib/python3/dist-packages/docutils/readers/__init__.py", line 78, in parse
    self.parser.parse(self.input, document)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/__init__.py", line 191, in parse
    self.statemachine.run(inputlines, document, inliner=self.inliner)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 172, in run
    input_source=document['source'])
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 239, in run
    context, state, transitions)
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 460, in check_line
    return method(match, context, next_state)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 2989, in text
    self.section(title.lstrip(), source, style, lineno + 1, messages)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 328, in section
    self.new_subsection(title, lineno, messages)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 396, in new_subsection
    node=section_node, match_titles=True)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 283, in nested_parse
    node=node, match_titles=match_titles)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 197, in run
    results = StateMachineWS.run(self, input_lines, input_offset)
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 239, in run
    context, state, transitions)
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 460, in check_line
    return method(match, context, next_state)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 2754, in underline
    self.section(title, source, style, lineno - 1, messages)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 328, in section
    self.new_subsection(title, lineno, messages)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 396, in new_subsection
    node=section_node, match_titles=True)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 283, in nested_parse
    node=node, match_titles=match_titles)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 197, in run
    results = StateMachineWS.run(self, input_lines, input_offset)
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 239, in run
    context, state, transitions)
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 460, in check_line
    return method(match, context, next_state)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 2754, in underline
    self.section(title, source, style, lineno - 1, messages)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 328, in section
    self.new_subsection(title, lineno, messages)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 396, in new_subsection
    node=section_node, match_titles=True)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 283, in nested_parse
    node=node, match_titles=match_titles)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 197, in run
    results = StateMachineWS.run(self, input_lines, input_offset)
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 239, in run
    context, state, transitions)
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 460, in check_line
    return method(match, context, next_state)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 2327, in explicit_markup
    nodelist, blank_finish = self.explicit_construct(match)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 2339, in explicit_construct
    return method(self, expmatch)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 2082, in directive
    directive_class, match, type_name, option_presets)
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 2131, in run_directive
    result = directive_instance.run()
  File "/usr/lib/python3/dist-packages/sphinx/ext/autodoc.py", line 1668, in run
    documenter.generate(more_content=self.content)
  File "/usr/lib/python3/dist-packages/sphinx/ext/autodoc.py", line 1013, in generate
    self.document_members(all_members)
  File "/usr/lib/python3/dist-packages/sphinx/ext/autodoc.py", line 1388, in document_members
    ModuleLevelDocumenter.document_members(self, all_members)
  File "/usr/lib/python3/dist-packages/sphinx/ext/autodoc.py", line 903, in document_members
    for (mname, member, isattr) in self.filter_members(members, want_all):
  File "/usr/lib/python3/dist-packages/sphinx/ext/autodoc.py", line 871, in filter_members
    not keep, self.options)
  File "/usr/lib/python3/dist-packages/sphinx/application.py", line 593, in emit_firstresult
    for result in self.emit(event, *args):
  File "/usr/lib/python3/dist-packages/sphinx/application.py", line 589, in emit
    results.append(callback(self, *args))
  File "/usr/lib/python3/dist-packages/sphinx/ext/napoleon/__init__.py", line 426, in _skip_member
    cls_path, _, _ = qualname.rpartition('.')
ValueError: not enough values to unpack (expected 3, got 0)

The napoleon sphinx extensions queries the attribute __qualname__ of the
given obj and expect a string as result. It uses a default value if this
attribute does not exist. The real Python modules do not have a
__qualname__ attribute, but the doc.conf.Mock object returns a Mock
object when queried for the __qualname__ attribute. Change the Mock
object to raise an AttributeError instead. This fixes #45684.
2018-02-01 19:23:53 +01:00
rallytime
d5faf6126b
[2017.7] Bump latest and previous versions 2018-01-30 15:39:10 -05:00
rallytime
a38d4d44fa
[2016.11] Bump latest and previous versions 2018-01-30 15:35:55 -05:00
rallytime
ce3902b158
Merge branch '2017.7' into merge-oxygen 2018-01-28 08:51:03 -05:00
rallytime
0ad101d560
Merge branch '2017.7' into 'oxygen'
Conflicts:
  - doc/man/salt.7
  - salt/modules/git.py
  - salt/modules/pacman.py
  - salt/states/git.py
  - tests/integration/modules/test_mac_user.py
  - tests/support/parser/__init__.py
2018-01-26 17:27:03 -05:00
Elias Probst
bec78276f3
Replace left-over mistyped codename reference (Hellium2014.7.0) 2018-01-26 22:52:10 +01:00
rallytime
f10c7ee92d
Merge branch '2017.7.3' into '2017.7'
No conflicts.
2018-01-26 09:59:21 -05:00
Ch3LL
84c8216901
Add PRs to 2017.7.3 Release Notes 2018-01-25 15:51:34 -05:00
Dmitry Kuzmenko
99a0e1f7e2
Added M2Crytpo release note. 2018-01-25 20:32:00 +03:00
Dmitry Kuzmenko
a67fe51a5c
Fixed some tests, updated a doc. 2018-01-25 20:31:59 +03:00
rallytime
d4dac9f7cc
Merge branch '2016.11' into '2017.7'
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
2018-01-25 10:42:14 -05:00
Nicole Thomas
b2390e69ca
Merge pull request #45505 from DSRCorporation/bugs/raet_deprecation
Deprecate RAET
2018-01-25 10:05:02 -05:00
Damon Atkins
1d21f86228
Update 2017.7.3.rst 2018-01-25 19:37:32 +11:00
Nicole Thomas
3a6837e232
Merge pull request #45675 from Ch3LL/rn_2016.11.9
Add new commits to 2016.11.9 release notes
2018-01-24 17:29:33 -05:00
Ch3LL
7b5bed36d9
Add new commits to 2016.11.9 release notes 2018-01-24 16:16:52 -05:00
rallytime
9f78e53d4b
Merge branch '2017.7.3' into '2017.7'
No conflicts.
2018-01-24 16:09:17 -05:00
Dmitry Kuzmenko
f88bbbe147
Raet deprecation warning and release note. 2018-01-24 22:49:18 +03:00
rallytime
1b4744165b
Add auth error raising change to oxygen release notes 2018-01-24 14:03:35 -05:00
rallytime
d31b41adeb
Update man pages for 2017.7.3 release 2018-01-24 13:46:43 -05:00
Nicole Thomas
e21088c1a4
Merge pull request #45662 from bdrung/2017.7
Fix documentation generation
2018-01-24 12:14:22 -05:00