salt/doc/topics/development
rallytime 8d1e1e7f94
Merge branch '2017.7' into '2018.3'
Conflicts:
  - .kitchen.yml
  - Gemfile
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - salt/client/ssh/__init__.py
  - salt/client/ssh/ssh_py_shim.py
  - salt/modules/boto_vpc.py
  - salt/modules/file.py
  - salt/modules/heat.py
  - salt/modules/smartos_vmadm.py
  - salt/modules/win_dsc.py
  - salt/returners/elasticsearch_return.py
  - salt/runners/salt.py
  - salt/states/module.py
  - salt/utils/win_functions.py
  - setup.py
  - tests/integration/modules/test_state.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
2018-03-15 17:22:05 -04:00
..
conventions Merge branch '2017.7' into '2018.3' 2018-02-27 17:13:28 -05:00
extend Fix templates for the new test module naming scheme 2017-02-23 23:19:44 +00:00
git Remove repeated words in docs (#37871) 2016-11-23 14:53:17 -07:00
raet Fixes for doc build errors 2015-05-27 11:40:31 -06:00
tests Merge branch '2017.7' into '2018.3' 2018-03-15 17:22:05 -04:00
architecture.rst Merge pull request #44275 from rallytime/arch-doc 2017-10-31 10:49:41 -06:00
contributing.rst Update the merge-forward docs to reference the 2018.3 branch 2018-03-05 10:04:30 -06:00
deprecations.rst Move 4 functions from salt.utils to salt.utils.versions 2017-08-15 12:53:57 -05:00
dunder_dictionaries.rst Update documentation for __salt__ in SDB modules 2017-12-04 17:41:49 -07:00
external_pillars.rst Updates documentation for external_pillar - Fixes Bash Example 2015-07-14 14:26:00 -07:00
hacking.rst Update hacking.rst 2017-04-05 15:12:08 +10:00
index.rst start doc layout 2016-07-27 19:56:35 +10:00
labels.rst Remove ":doc:" references from a bunch of doc/* files 2016-12-15 16:09:27 -07:00
logging.rst Remove ":doc:" references from a bunch of doc/* files 2016-12-15 16:09:27 -07:00
modular_systems.rst Various doc updates to fix warnings in doc build 2017-02-06 16:56:58 -07:00
package_providers.rst Move 13 functions from salt.utils to salt.utils.data 2017-10-10 17:42:42 -05:00
pull_requests.rst add pull requests doc 2016-10-21 13:26:18 -06:00
reporting_bugs.rst Remove ":doc:" references from a bunch of doc/* files 2016-12-15 16:09:27 -07:00
topology.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00
translating.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00
tutorial.rst Update tutorial.rst 2016-10-12 10:34:28 -06:00