Colton Myers
d3d0e004d9
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/minion.py
salt/modules/gpg.py
salt/modules/keystone.py
salt/modules/pw_user.py
salt/states/reg.py
setup.py
2015-08-17 16:54:16 -06:00
Pedro Algarvio
e7cb3be2a0
Document the added options
2015-08-17 19:48:48 +01:00
Nitin Madhok
714f9766e7
Correct spelling of integration in docs
2015-08-12 13:30:03 -04:00
Nitin Madhok
264f3bf656
Correct spelling of integration in docs
2015-08-12 13:27:30 -04:00
Jacob Hammons
d8d5045d3b
Updates to cloud docs for the provider > driver change in provider configs.
...
Refs #24797
2015-08-10 09:20:26 -06:00
Colton Myers
e29be766bb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
debian/changelog
doc/man/salt.7
salt/cloud/__init__.py
salt/cloud/clouds/proxmox.py
salt/cloud/clouds/vmware.py
salt/config.py
salt/fileclient.py
salt/minion.py
salt/modules/chocolatey.py
salt/modules/localemod.py
salt/modules/pacman.py
salt/modules/pkgng.py
salt/modules/schedule.py
salt/modules/state.py
salt/modules/win_file.py
salt/modules/win_pkg.py
salt/state.py
salt/states/file.py
salt/utils/args.py
tests/unit/states/file_test.py
2015-07-30 16:54:44 -06:00
Justin Findlay
d377f42c48
rework deprecation documentation for release names
...
Fixes #25827 .
2015-07-29 15:50:33 -06:00
Colton Myers
99fc7ecb4b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt.7
salt/cloud/__init__.py
salt/fileclient.py
salt/modules/file.py
salt/modules/gpg.py
2015-06-29 16:49:40 -06:00
Justin Findlay
8575192cc4
revise label and milestone documentation
2015-06-27 16:17:44 -06:00
Justin Findlay
152a9b2a12
fix some malformed doc links and anchors
2015-06-24 16:56:52 -06:00
Mike Place
7dae045b3c
Remove overstate documentation
2015-06-12 13:00:08 -06:00
Colton Myers
94d6ef1d17
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/salt.modules.ipmi.rst
doc/ref/states/all/salt.states.tls.rst
doc/topics/cloud/index.rst
doc/topics/cloud/vsphere.rst
doc/topics/eauth/index.rst
salt/cli/batch.py
salt/modules/cmdmod.py
salt/modules/ipmi.py
salt/netapi/rest_cherrypy/app.py
salt/runners/http.py
salt/states/boto_elb.py
salt/states/dockerio.py
salt/states/linux_acl.py
salt/states/win_servermanager.py
salt/wheel/config.py
2015-06-09 11:41:07 -06:00
Jacob Hammons
d45c4ed11f
Bug fixes and build errors
...
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
2015-06-05 17:32:35 -06:00
Justin Anderson
a6a1f87cd9
Merge pull request #24380 from rallytime/bp-24357
...
Backport #24357 to 2015.5
2015-06-04 14:13:51 -06:00
rallytime
bf85772042
Make sure the parameters are in the correct order
2015-06-04 11:39:39 -06:00
rallytime
9f53809cde
Add "* Change" label parameters
2015-06-04 11:39:39 -06:00
rallytime
b27a15e774
Remove "workaround" wording
2015-06-04 11:39:39 -06:00
rallytime
9fff35a959
Some small fixes
2015-06-04 11:39:39 -06:00
rallytime
54a7089fd6
Link the new labels doc in contributing and hacking docs
2015-06-04 11:39:39 -06:00
rallytime
375695e696
Add pull request label definitions
2015-06-04 11:39:39 -06:00
rallytime
de945638d3
Add Feature Request label definition
2015-06-04 11:39:39 -06:00
rallytime
684f291bd4
Add issue definition and augment functional areas section
2015-06-04 11:39:39 -06:00
rallytime
2da13dd525
Start a "what are all of these labels for?" doc
2015-06-04 11:39:38 -06:00
zhujinhe
f08c875015
fix invoke issues of Jinja Macros example
...
1.'php_ini' not defined in /srv/pillar/php.sls, {{ salt.pillar.get('php_ini', {}) | json() }} gets empty value.
2.no section defined, should be 'section_name'.
3.remove empty line.
2015-06-03 16:38:16 -06:00
zhujinhe
15cdd58968
fix invoke issues of Jinja Macros example
...
1.'php_ini' not defined in /srv/pillar/php.sls, {{ salt.pillar.get('php_ini', {}) | json() }} gets empty value.
2.no section defined, should be 'section_name'.
3.remove empty line.
2015-06-03 12:16:29 +08:00
Jason Thigpen
beff7c7785
Correct usage of import_yaml in formula documentation
2015-05-31 09:43:15 -06:00
Jason Thigpen
37775a5fa6
Correct usage of import_yaml in formula documentation
2015-05-29 17:12:59 -07:00
Colton Myers
c4f5e231fa
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
...
Conflicts:
doc/_themes/saltstack2/layout.html
doc/conf.py
doc/index.rst
doc/ref/modules/all/salt.modules.hipchat.rst
doc/topics/releases/index.rst
salt/client/ssh/client.py
salt/cloud/clouds/vsphere.py
salt/modules/boto_dynamodb.py
salt/modules/boto_route53.py
salt/modules/data.py
salt/modules/http.py
salt/modules/tls.py
salt/output/compact.py
salt/states/boto_elb.py
salt/states/linux_acl.py
salt/states/rabbitmq_user.py
salt/states/win_servermanager.py
salt/utils/dictupdate.py
salt/wheel/config.py
2015-05-29 15:10:13 -06:00
Jacob Hammons
0689815d0e
Fixes for doc build errors
2015-05-27 11:40:31 -06:00
Colton Myers
60f2e9eefb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/development/contributing.rst
salt/modules/tls.py
2015-05-26 16:38:42 -06:00
Justin Findlay
fa2d411f53
update example release branch in contrib docs
2015-05-25 23:06:39 -06:00
Justin Findlay
a0b76b57b3
clarify git rebase instructions
2015-05-25 23:05:23 -06:00
Justin Findlay
3517e0095f
fix contribution docs link typos
2015-05-25 22:55:19 -06:00
Justin Findlay
651629c6a4
backport dev contrib doc updates to 2015.5
2015-05-25 22:54:54 -06:00
Oliver Bestwalter
4ba0f20ef6
fix typos
2015-05-14 01:23:20 +02:00
rallytime
0fe9d05ab0
Make sure the parameters are in the correct order
2015-05-05 14:35:44 -06:00
rallytime
e9491e8991
Add "* Change" label parameters
2015-05-05 14:21:25 -06:00
rallytime
8024acc7ad
Remove "workaround" wording
2015-05-05 13:47:34 -06:00
rallytime
ed788a2965
Some small fixes
2015-05-05 13:37:44 -06:00
rallytime
475a32d3aa
Link the new labels doc in contributing and hacking docs
2015-05-05 13:23:08 -06:00
rallytime
644201aed8
Add pull request label definitions
2015-05-05 13:11:59 -06:00
rallytime
3c95bd9a6b
Add Feature Request label definition
2015-05-04 12:43:34 -06:00
rallytime
1780e2eb8a
Add issue definition and augment functional areas section
2015-05-04 11:39:32 -06:00
rallytime
85e9284bac
Start a "what are all of these labels for?" doc
2015-05-03 21:11:18 -06:00
Justin Findlay
e586c66917
revise contributing documentation
2015-04-16 10:28:00 -06:00
rallytime
ccfa9f8158
Fix some broken links on the contributing docs
...
Fixes #22537
2015-04-10 14:06:36 -06:00
Justin Findlay
f50949e209
revise unit test documentation
2015-03-31 00:40:05 -06:00
Justin Findlay
0f631abe58
fix contributing doc errors
2015-03-10 16:04:17 -06:00
Justin Findlay
79255566b9
revise saltstack/salt contrib documentation
2015-02-25 15:05:21 -07:00
Mike Place
970c32ae8e
Document the bug reporting procedure
2015-02-18 09:22:28 -07:00
