rallytime
9064d3bbfb
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/file.py
- salt/states/archive.py
2016-04-25 15:45:17 -06:00
Justin Findlay
9b5c14c37c
salt-cloud -u downloads stable version from bootstrap.saltstack.com by default (#32837 )
...
* salt-cloud -u downloads stable version
* utils.cloud.update_bootstrap: minor edits of docstring
2016-04-25 13:53:54 -06:00
rallytime
d7b4b8b081
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- doc/ref/configuration/master.rst
- doc/ref/configuration/minion.rst
- salt/config.py
2016-04-04 12:36:14 -06:00
rallytime
7e642b8381
Audit config.py default types and values - first sweep
...
- Updated standard types in VALID_OPTS dict where necessary
- Updated default values to match VALID_OPTS in DEFAULT_*_OPTS dicts
- Updated master/minion configuration reference docs to match changes
- Removed enumerate_proxy_minions value as it's not referenced anywhere in code
2016-03-31 13:50:51 -06:00
Jacob Hammons
8ec5d989ad
2015.8.8 release docs
2016-03-23 14:00:30 -06:00
Benjamin Drung
8edd2c1add
Fix typos of dependency
2015-11-04 10:58:40 +01:00
Jacob Hammons
cfadda0c0c
Added note regarding missing spm exe on Debian/Ubuntu
...
Minor fixes to spm docs
2015-10-21 22:34:45 -06:00
Colton Myers
35425b14ad
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
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-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
salt/modules/pip.py
salt/states/user.py
2015-10-07 12:06:12 -06:00
Jacob Hammons
76dc8de71b
Assorted doc bugs
...
Refs #9051
Refs #13407
Refs #21475
Refs #14876
Refs #27005
2015-10-05 17:37:13 -06:00
Jacob Hammons
f7a9e25d52
Fixed sphinx / latex build warnings and errors
...
Added missing modules to contents
2015-09-17 09:23:24 -06:00
Jacob Hammons
701f47a658
Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py
...
Added salt-proxy release notes topic
Added note to pip state for Refs #21845
Regenerated and versioned man pages
2015-09-01 17:09:35 -06:00
Colton Myers
1e1f5f3a95
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/cloud/config.rst
doc/topics/cloud/index.rst
salt/modules/git.py
salt/states/git.py
salt/states/pkgrepo.py
2015-09-01 15:35:21 -06:00
Jacob Hammons
0ec036350d
Updates to salt-ssh and salt-key
...
#24510
2015-08-31 20:00:30 -06:00
Jacob Hammons
fefd7aa7e8
2015.8.0 release notes and doc/conf.py updates
2015-08-25 15:12:20 -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
Alexey Pakseykin
c33eb813ea
Change docs for --static option with JSON - text B
2015-07-27 09:00:59 -06:00
Alexey Pakseykin
89dd2ec8fb
Change docs for --static option with JSON - text A
2015-07-27 09:00:59 -06:00
Joseph Hall
1e4f7aa574
Add man page for spm, change pillar to .orig
2015-06-30 09:45:13 -06:00
Colton Myers
d9db80cafd
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
2015-06-10 12:01:43 -06:00
Jacob Hammons
8df5d53bb8
Refs #24235
2015-06-10 09:45:03 -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
Thomas Jackson
2c6a5c7d1e
Add comment attempting to explain the security shortcomings of salt-cp
...
salt-cp definitely has its uses, but I want to call out the fact that it isn't designed as a secure file transfer mechanism.
2015-06-02 18:26:04 -07:00
Colton Myers
a18e017619
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/man/salt.1
doc/ref/cli/salt.rst
2015-04-24 10:07:48 -06:00
Jonathan Ballet
19efd419b5
Improve state_output documentation
...
List all the available settings in the documentation and on the command
line.
Also, make the documentation clearer about the different possibilities.
2015-04-23 10:22:11 +02:00
Colton Myers
8d9874a78a
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-16 10:37:38 -06:00
Michael Steed
70f1ca9ea5
Add missing command line options to man pages
...
Refs #22676
2015-04-14 17:32:56 -06:00
Michael Steed
5efb284c22
Update salt-call manpage to match cli help text
...
refs #22239
2015-04-14 11:52:55 -06:00
Thayne Harbaugh
6179839225
Improve documentation for nested nodegroup.
2015-04-09 01:43:18 -06:00
Erik Johnson
175ba127be
Merge branch '2014.7' into 2014.7-2015.2
...
Conflicts:
salt/modules/archive.py
2015-01-14 14:26:22 -06:00
rallytime
4a1a5123f2
Remove old --out options from salt-cloud docs
...
Fixes #19453
2015-01-13 21:39:27 -07:00
Thomas Jackson
23674c100d
Comma cleanup
2014-12-12 11:33:14 -08:00
Thomas S Hatch
e094b0136f
Merge pull request #18902 from jacksontj/develop
...
More grammar/style cleanup
2014-12-12 09:40:55 -07:00
Metin OSMAN
d0799a864c
Update documentation
2014-12-11 22:25:29 +01:00
Thomas Jackson
68c0dc0717
Whitespace cleanup
2014-12-11 07:53:20 -08:00
Henrik Holmboe
1f3ba9ced5
Add possible values to arguments in Salt man-page
2014-11-03 21:27:14 +01:00
Henrik Holmboe
d3da8549a2
Typo jod -> job
2014-11-03 21:26:28 +01:00
Henrik Holmboe
878a227837
Choose vs chose typo
2014-11-03 20:54:39 +01:00
Colton Myers
8d0bf0ee95
Merge branch '2014.7' into develop
...
Conflicts:
salt/states/pip_state.py
2014-09-15 11:49:04 -06:00
Seth House
978931c470
Added salt-unity manpages
...
Closes #13937
2014-09-13 12:56:25 -06:00
Thomas S Hatch
39b107a283
Merge pull request #14820 from steverweber/add_conf_help
...
show_timeouts, new default
2014-09-02 12:13:31 -06:00
rallytime
cfcfb4bdac
Change --list-profiles to accept an argument such as "linode" or "all"
2014-08-26 08:03:39 -06:00
rallytime
0f4f68eddf
Add --list-providers and --list-profiles to cloud docs
2014-08-26 00:18:57 -06:00
steve
d13c7275a7
show_timeouts, new default
2014-08-14 13:10:52 -04:00
Erik Johnson
2849950bce
Docs cleanup
...
Fixes double-colons by making them code-block directives, so they do not
erroneously show up as "PYTHON" blocks. Also corrects a few instances of
2nd person pronoun usage.
2014-07-13 11:02:33 -05:00
rallytime
f0d9db2497
Removed the term "Hydrogen" from versionadded notation
2014-07-01 15:01:12 -06:00
Seth House
acb203c735
Added salt-api to CLI TOC
2014-06-20 10:20:58 -06:00
Seth House
53bab586f4
Merged salt-api into Salt
...
Woot!
The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.
Conflicts:
debian/changelog
debian/control
doc/conf.py
doc/index.rst
opt_requirements.txt
salt/config.py
salt/loader.py
2014-06-18 22:13:56 -06:00
Erik Johnson
5db13960b1
Add links to targeting pages
2014-06-11 16:19:24 -05:00
Pedro Algarvio
7bd8b1360f
Remove remaining exsel code
2014-05-29 01:32:54 +01:00
