Nitin Madhok
1e2a8c1a36
Adding more options that can be specified in create and docs for them
2015-04-01 14:42:58 -04:00
Nitin Madhok
4d6ac06947
Adding ability to specify and override the default vCPUS and memory
2015-04-01 05:54:52 -04:00
Thomas S Hatch
d2e4ac840d
Merge pull request #22212 from ckochenower/2015.2
...
Add detail for writing a returner
2015-03-31 15:15:52 -06:00
Corin Kochenower
f44e25715a
Add detail for writing a returner
2015-03-31 13:59:11 -06:00
Nitin Madhok
50f96bc389
Doc fixes
2015-03-31 14:25:53 -04:00
Nitin Madhok
bfa4ef77e2
Merge branch 'develop' of https://github.com/saltstack/salt into vmware-cloud-driver
2015-03-31 12:56:19 -04:00
Nitin Madhok
931ece7d20
Fixing some spninx errors and violations
2015-03-31 12:54:32 -04:00
Nitin Madhok
3fa499fd1d
Adding Getting Started with VMware docs
2015-03-31 12:06:20 -04:00
Clint Armstrong
51b32b860b
remove x509 runner docs
2015-03-31 11:31:49 -04:00
Clint Armstrong
2fd9cf70be
Merge branch 'develop' into x509
2015-03-31 11:29:46 -04:00
Nitin Madhok
3d501b7a66
Docs fixes and adding VMware to core config docs
2015-03-31 11:23:36 -04:00
Nicole Thomas
44c7eb4d4b
Merge pull request #22169 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-03-31 09:21:36 -06:00
Justin Findlay
f50949e209
revise unit test documentation
2015-03-31 00:40:05 -06:00
rallytime
1abaacd868
Add windows package installers to docs
2015-03-30 16:10:10 -06:00
Colton Myers
124ad51c40
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/ref/index.rst
doc/topics/eauth/index.rst
salt/beacons/__init__.py
salt/beacons/service.py
salt/loader.py
salt/minion.py
salt/output/nested.py
2015-03-30 15:10:17 -06:00
John Syrinek
663b19e5b7
Improves example illustrating SLS-to-Python mapping
2015-03-30 14:04:05 -05:00
Nitin Madhok
3143a54817
Excluding get_configured_provider() and script() from sphinx
2015-03-30 14:22:23 -04:00
Mike Place
4538ea629f
Merge pull request #22057 from jfindlay/opts_prefix
...
remove default prefix of '-' in archive.tar and archive.cmd_unzip
2015-03-30 10:45:11 -06:00
Mike Place
27465e0f0f
Merge pull request #22129 from terminalmage/docker-ng
...
Add docker-ng module
2015-03-30 10:37:45 -06:00
Mike Place
adb8d5c718
Merge pull request #22054 from jfindlay/log_color
...
convert custom LogRecord attribute formatting from {}- to %-style
2015-03-30 10:37:18 -06:00
Mike Place
696065a037
Merge pull request #22133 from eliasp/develop-pilar_ldap-map-support
...
Implement 'map' mode in LDAP pillar module
2015-03-30 10:08:10 -06:00
Mike Place
98bc85a399
Merge pull request #22123 from F30/autodoc-fix
...
Fix custom Sphinx formatter for aliased functions
2015-03-30 10:05:20 -06:00
Nitin Madhok
031a78b86d
Adding script function to this driver and adding this driver to clouds docs
2015-03-29 23:32:34 -04:00
Elias Probst
c00c14f2be
Initial documentation improvements for pillar.pillar_ldap
2015-03-30 01:58:54 +02:00
Erik Johnson
2e823b84e8
Add docker-ng module
2015-03-29 12:32:07 -05:00
Erik Johnson
f7e6523461
Add dockerng execution module docs to toctree
2015-03-29 12:32:07 -05:00
Erik Johnson
6846d3e01b
Update the exclude-members for lxc module
2015-03-29 12:32:07 -05:00
Erik Johnson
d9f0273680
Update the exclude-members for nspawn module
2015-03-29 12:32:07 -05:00
Peter Tripp
960df2b043
Add documentation for multiple Ubuntu PPAs. Fixes #18822
2015-03-29 00:31:07 -07:00
Felix Dreissig
0869680435
Fix custom Sphinx formatter for aliased functions
...
Regression of @99bcf20: Since Sphinx 1.2.1 (commit
sphinx-doc/sphinx@574a796 ), sphinx.ext.autosummary overwrites custom-set
documenters.
This is not a particularly elegant solution, but none of the events from
sphinx.ext.autodoc allows editing a function's name. Subclassing other
autodoc classes also appears to be quite challenging.
2015-03-29 01:08:26 +01:00
jfindlay
d5a61388c4
Merge pull request #22099 from cro/bp-21101
...
Backport #21101 to 2015.2
2015-03-28 11:33:17 -06:00
Nitin Madhok
1d3a11a658
Merge branch 'develop' of https://github.com/saltstack/salt into vmware-cloud-driver
2015-03-28 02:22:51 -04:00
Mike Place
ef942ce3c8
Document becaon intervals
2015-03-27 16:38:36 -06:00
Jacob Hammons
7cb6c8fdcb
Updated salt man page
2015-03-27 12:15:49 -06:00
Justin Findlay
0e57aeb3d0
mention console log colors in beryllium release notes
2015-03-26 23:21:30 -06:00
Justin Findlay
294dfe2d94
clarify and expand console log colors help
2015-03-26 23:21:30 -06:00
Justin Findlay
4b2ebfaf7c
document '-' prefix removal in Berrylium notes
2015-03-26 22:23:11 -06:00
Nitin Madhok
71c73d3d62
Adding salt.cloud.clouds.vmware to docs
2015-03-26 19:45:14 -04:00
Thomas S Hatch
45827bc933
Merge pull request #22060 from techhat/blobstorage
...
Add azurefs external file server and supporting code and docs
2015-03-26 17:12:19 -06:00
Seth House
fa3d1c3ad4
Added runner module for working with sdb
...
This is literally a copy of the execution module.
2015-03-26 18:34:53 -04:00
Joseph Hall
6ac0bcd2e4
Update docs for Azure blob management
2015-03-26 15:12:33 -06:00
Clint Armstrong
59eea7dfd6
added runner docs
2015-03-26 13:24:58 -04:00
Clint Armstrong
12fa6950fc
added state docs
2015-03-26 13:24:07 -04:00
Clint Armstrong
b17eb94168
added state docs
2015-03-26 13:24:03 -04:00
Clint Armstrong
aab3d37314
added module to doc index
2015-03-26 13:22:26 -04:00
Nicole Thomas
f38b67b687
Merge pull request #22041 from basepi/merge-forward-2015.2
...
[2015.2] Merge forward from 2014.7 to 2015.2
2015-03-26 10:30:21 -06:00
Seth House
8e203c4a0a
Added the etcd sdb module to the module index
2015-03-26 11:52:21 -04:00
Colton Myers
afeb4743a1
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-03-26 09:45:55 -06:00
Rudy Attias
f733bfc7b0
added an example usage of smb_port
2015-03-26 17:31:38 +02:00
Mike Place
6fb70ea874
Add etcd sdb to 2015.2 release notes
2015-03-26 09:13:28 -06:00
Colton Myers
74dcd7df1c
Add 2014.7.4 release notes
2015-03-26 09:03:35 -06:00
jfindlay
30013cd79e
Merge pull request #22027 from jfindlay/notes
...
edited 2015.2.0 release notes
2015-03-26 07:49:23 -06:00
Justin Findlay
7ac7b74621
add release note about reactor users for runners
2015-03-25 21:14:10 -06:00
Justin Findlay
9b1e3f7a2a
wrap at 80 chars
2015-03-25 21:12:51 -06:00
Justin Findlay
88add58cef
misc cachedout edits
2015-03-25 21:10:48 -06:00
Nicole Thomas
e7c7608ae2
Merge pull request #22018 from whiteinge/doc-sdb-modules-index
...
Add sdb modules to the module index
2015-03-25 16:36:50 -06:00
Mike Place
b0bd0b7aeb
Merge pull request #22005 from cro/eauth_activedirectory
...
Add ability to eAuth against Active Directory
2015-03-25 15:41:56 -06:00
Seth House
264c08841e
Added generated .rst files for the various sdb modules
2015-03-25 17:11:20 -04:00
Seth House
c2af83ea3e
Added sdb modules to the module index
2015-03-25 17:08:19 -04:00
Thomas S Hatch
c58fe8bc07
Update release notes back to Jan 29th
2015-03-25 13:23:38 -06:00
C. R. Oldham
2eb6d26995
Add authentication against Active Directory
2015-03-25 13:01:37 -06:00
C. R. Oldham
7421042dd2
Add authentication against Active Directory
2015-03-25 12:49:35 -06:00
Colton Myers
b0fe5cc955
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/fileclient.py
salt/minion.py
tests/unit/pyobjects_test.py
2015-03-25 12:04:30 -06:00
Colton Myers
7ba2404cc9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/master
conf/minion
doc/ref/configuration/master.rst
salt/loader.py
salt/minion.py
salt/modules/ssh.py
salt/output/nested.py
salt/utils/network.py
2015-03-25 09:28:04 -06:00
Nicole Thomas
cda629d531
Merge pull request #21963 from cachedout/2014_7_3_changes
...
Release note changes
2015-03-24 17:32:24 -06:00
Mike Place
2639f4b566
Release note changes
2015-03-24 17:02:18 -06:00
Thomas S Hatch
afcf1d7b27
Merge pull request #21955 from rallytime/update_master_conf_doc
...
Add default for pillar_source_merging_strategy in conf/master file
2015-03-24 16:45:40 -06:00
Mike Place
53846aa284
Merge pull request #21958 from cachedout/2015_2_mm_note
...
Add known multimaster issue to 2015.2 notes
2015-03-24 15:50:16 -06:00
Mike Place
98642d7b87
Add known multimaster issue to 2015.2 notes
2015-03-24 15:49:58 -06:00
Mike Place
e6d70629df
2014.7.3 release notes
2015-03-24 15:48:05 -06:00
rallytime
73a0df18a8
There are 4 values, not 3.
2015-03-24 14:57:29 -06:00
rallytime
c98118eb55
Update pillar_source_merging_strategy config doc spacing
...
to match accross all config values
2015-03-24 14:56:09 -06:00
John Syrinek
6558d9e6d7
Fix unless example
...
The second `unless` example failed to compile
2015-03-24 14:02:27 -05:00
Justin Findlay
1436d4011a
add versions_report update to release notes
2015-03-23 14:02:16 -06:00
Thomas Jackson
2512a0841d
Add LazyLoader and Singleton auth to 2015.2 release notes
2015-03-23 11:42:48 -07:00
Godefroid Chapelle
ffe267a741
Specify valid values for gitfs_provider option
2015-03-23 15:33:10 +01:00
Arnold Bechtoldt
db38f80945
update references, fixes #21879
2015-03-22 10:16:41 +01:00
Colton Myers
70406867a4
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/client/__init__.py
salt/modules/file.py
salt/modules/yumpkg.py
salt/modules/zypper.py
tests/integration/shell/auth.py
tests/unit/states/archive_test.py
tests/unit/states/module_test.py
2015-03-20 20:09:19 -06:00
Nicole Thomas
cdf10e5999
Merge pull request #21842 from ticosax/docu-gitfs
...
Add a note regarding pkg-config to install libgit2
2015-03-20 11:37:12 -06:00
Nicolas Delaby
b01dfa9150
Add a note regarding pkg-config to install libgit2
2015-03-20 16:25:35 +01:00
Colton Myers
2b1f400ab4
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/topology/syndic.rst
salt/client/__init__.py
salt/daemons/masterapi.py
salt/minion.py
salt/modules/dockerio.py
2015-03-19 16:03:29 -06:00
Carl Meyers
cdd940761f
Update index.rst salt-ssh doc
...
Fixed typos and changed some wording.
2015-03-18 22:35:04 -07:00
rallytime
f56cdd5489
Update syndic documentation
...
Add some docs about installing a minion on the syndic to help reduce the amount of time spent waiting for the CLI to return.
2015-03-18 16:05:07 -06:00
Preston Marshall
05d06a5d09
Add note about ldap module requirement
...
Currently the only way you can figure out that you need the LDAP module is to read the source. I assumed it was installed as part of my OS package, but it is not. This documents it clearly that you need to install the module.
2015-03-18 14:32:15 -05:00
jfindlay
078b849ee3
Merge pull request #21763 from whiteinge/doc-pdf-link
...
Replaced PDF link to RTD to the GitHub releases page
2015-03-18 00:41:30 -06:00
Seth House
2e426ddec7
Replaced PDF link to RTD to the GitHub releases page
...
Temporary fix until we something more permanent in place.
2015-03-17 22:43:00 -06:00
Joseph Hall
5686e64149
Adding docs for new Azure functionality
2015-03-17 21:58:19 -06:00
Colton Myers
fd93491a5f
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/linodepy.py
salt/master.py
salt/modules/boto_route53.py
salt/modules/virt.py
salt/renderers/gpg.py
salt/runners/doc.py
salt/runners/jobs.py
salt/runners/manage.py
salt/runners/virt.py
salt/utils/event.py
salt/utils/http.py
2015-03-16 15:12:02 -06:00
Colton Myers
a983f1b611
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/win_ntp.py
salt/templates/rh_ip/rh5_eth.jinja
salt/templates/rh_ip/rh6_eth.jinja
setup.py
2015-03-13 17:02:19 -06:00
rallytime
01c8f94b31
Add minimum version dependency for linode-python in docs
...
And warn users of older versions leaking sensitive information
into the debug logs.
2015-03-13 11:53:02 -06:00
Thomas S Hatch
cc9d294fcd
Merge pull request #21569 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-03-12 13:36:39 -06:00
Mike Place
5c59b4bd21
Note change in yosemite max values and warn.
...
Closes #21589
2015-03-12 10:02:53 -06:00
jfindlay
5b4972b55d
Merge pull request #21574 from rallytime/full_version
...
Use the full version for a versionadded tag
2015-03-11 17:50:23 -06:00
rallytime
0171f68600
Use the full version for a versionadded tag
2015-03-11 16:29:08 -06:00
Colton Myers
fec632ae18
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/utils/cloud.py
2015-03-11 15:18:00 -06:00
Colton Myers
ebe7eeafd9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/conf.py
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/cloud/clouds/linode.py
salt/states/composer.py
salt/states/win_update.py
2015-03-11 15:14:56 -06:00
Elias Probst
bc9a30b7e9
Typo (rendered → renderer)
2015-03-11 21:15:32 +01:00
Mike Place
87bd28b8cb
Note the issue number
2015-03-11 12:19:51 -06:00
Mike Place
9d5da3b878
Note the change in release notes
2015-03-11 12:19:51 -06:00
Thomas S Hatch
0eb66a36cb
Merge pull request #21162 from cro/linode-python-driver2
...
Update linode salt-cloud driver to support using either linode-python or apache-libcloud
2015-03-11 11:45:15 -06:00
Seth House
049975a1ca
Added versionadded for ext_pillar_first
2015-03-11 11:53:59 -04:00
Seth House
5f1feb838d
Switch the current release version back to 2014.7.2
...
Accidentally bumped in #21467 .
2015-03-10 22:44:54 -04:00
Seth House
c673e24a66
Merge pull request #21529 from whiteinge/doc-current-release-shortcut
...
Replace current release Jinja variable with rST substitution
2015-03-10 22:11:07 -04:00
Seth House
43709e0e10
Replace current release Jinja variable with rST substitution
...
Follow-up to the changes in #21286 .
2015-03-10 22:06:59 -04:00
Thomas S Hatch
cc52707af9
Merge pull request #21516 from jfindlay/revise_contrib_doc
...
fix contributing doc errors
2015-03-10 17:59:39 -06:00
Erik Johnson
d25677e954
Merge branch '2015.2' into 2015.2-develop
2015-03-10 17:47:30 -05:00
Justin Findlay
0f631abe58
fix contributing doc errors
2015-03-10 16:04:17 -06:00
twellspring
6461b37e0f
Clarify Mine Functions Aliases documentation
...
Clarify how to specify positional parameters.
2015-03-10 11:12:17 -07:00
Mike Place
eef62c762d
Merge pull request #21492 from cachedout/tcp_doc
...
Note the change to TCP keepalives in release notes
2015-03-10 10:12:13 -06:00
Mike Place
393cf9c13a
Note the change to tcp keepalives in release notes
2015-03-10 10:45:16 -06:00
Jacob Hammons
921d679065
Regenerated and updated man pages, updated release version in conf.py to 2014.7.2
2015-03-10 09:22:57 -06:00
Seth House
6aa498947a
Removed SaltConf banner
2015-03-10 09:05:06 -04:00
Jacob Hammons
767a3c378d
Updated man pages, updated copyright year in conf.py
2015-03-09 18:36:38 -06:00
Mike Place
56bac362fd
Change bootstrap instructions to two liner
2015-03-09 18:24:53 -06:00
jfindlay
8ff95ac138
Merge pull request #21443 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-03-09 16:55:25 -06:00
jfindlay
fba2284161
Merge pull request #21447 from thatch45/beacon_doc
...
MOAR beacons docs
2015-03-09 15:58:26 -06:00
Thomas S Hatch
dc691ae3f4
Add return data example
2015-03-09 14:33:12 -06:00
Thomas S Hatch
bf201865d0
MOAR beacons docs
2015-03-09 14:10:06 -06:00
rallytime
a71aa68415
Remove .rst from doc link
...
Fixes #21442
2015-03-09 12:58:07 -06:00
Colton Myers
d17c908b42
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/pillar/index.rst
salt/beacons/diskusage.py
salt/beacons/network_info.py
salt/minion.py
salt/modules/iptables.py
salt/modules/nacl.py
salt/modules/win_firewall.py
2015-03-09 12:52:14 -06:00
Thomas S Hatch
ecacdcbe75
Merge branch 'develop' of https://github.com/VynceMontgomery/salt into VynceMontgomery-develop
2015-03-09 11:07:14 -06:00
Thomas S Hatch
76a976baca
Merge pull request #21412 from eliasp/develop-doc-topics-tutorial-gitfs_separate_repo_for_top.sls
...
Suggest a separate repo for `top.sls`.
2015-03-09 10:51:39 -06:00
Thomas S Hatch
d16aa59c6d
Merge pull request #21379 from jacksontj/2015.2
...
2015.2: Add raw bool support to decorators
2015-03-09 10:46:08 -06:00
Joseph Hall
6238c6c8f4
Merge pull request #21410 from PeterS242/develop
...
Update faq.rst
2015-03-08 09:14:50 -06:00
Elias Probst
583239b893
Suggest a separate repo for top.sls.
...
This replaces the suggestion to keep `top.sls` out of other branches
which is rather unpractical, as it would require to manually delete
it from each new created branch and prevent deleting it when merging
the branch back into `master`.
2015-03-08 09:50:20 +01:00
Peter Smith
d836b2b3df
Update faq.rst
...
Fixed misspelling on "alternative" and updated cmd.run procedure to disconnect all input and output for the thread before executing the NOHUP.
2015-03-08 00:54:50 -06:00
Erik Johnson
0aa1029f24
correction to grains example
2015-03-07 11:40:43 -07:00
Vynce Montgomery
2723cb57a3
finish changing variable name
...
a partial edit, renaming a variable for clarity, missed some cases.
2015-03-06 23:33:05 -08:00
Thomas Jackson
b8e39c13f9
Add docs for new raw boolean support of depends decorator
2015-03-05 22:02:34 -08:00
James Lamb
f18dc55ccb
Merge branch 'develop' of https://github.com/jimmystewpot/salt into develop
2015-03-06 15:12:55 +11:00
James Lamb
ae1728ec4f
Update documentation to include how to set a static IP within the VPC for aws/ec2
2015-03-06 15:10:02 +11:00
rallytime
414990fc03
2015.2 --> 2015.2.0
2015-03-05 15:02:01 -07:00
rallytime
e9402e7564
Remove "Lithium" and change to "2015.2.0" for versionadded tags
2015-03-05 12:44:22 -07:00
Nitin Madhok
b9cdd2b089
Replacing provider aws with ec2 fixes #21274
2015-03-04 20:49:00 -05:00
s8weber
ad869c74b1
add pillar_safe_render_error config
...
allow a salt admin to config if the detailed render error of pillars
can be passed to the minion.
2015-03-04 10:22:29 -05:00
Boris Feld
e97a34cae2
Update salt_token name
...
salt_token seems to be now saved as ~/salt_token by default (a52ebdac3b/salt/config.py (L2192)
2015-03-04 11:52:51 +01:00
jfindlay
a52ebdac3b
Merge pull request #21286 from ahus1/ahus1_releasedocs
...
make latest 2014.7.x releases visible in documentation
2015-03-03 23:19:26 -07:00
Alexander Schwartz
0887dfe5d8
make latest 2014.7.x releases visible in documentation
2015-03-03 17:14:06 -07:00
Erik Johnson
ec2fe0d553
Add nspawn.remove function
...
Also adds nspawn.destroy as an alias, for those who are used to managing
LXC containers.
2015-03-03 14:38:53 -07:00
Erik Johnson
046a8fed7a
Add compatibility function "remove"
...
For people using a mix of LXC and nspawn containers
2015-03-03 14:36:45 -07:00
Erik Johnson
ee570cf0a2
Add RST file for nspawn
2015-03-03 10:10:50 -07:00
Thomas S Hatch
3467622977
Merge pull request #21229 from thatch45/master_service
...
Engines
2015-03-03 09:35:48 -07:00
Seth House
714921a5dc
Added autosummary placeholders for new models
2015-03-02 22:14:33 -07:00
Seth House
b6c1b2601f
Added new modules to the module indexes
2015-03-02 22:13:42 -07:00
Seth House
1399949196
Merge remote-tracking branch 'upstream/2015.2' into develop
2015-03-02 14:19:37 -07:00
Seth House
57b1f67daa
Added autosummary generated placeholders for the new module docs
2015-03-02 14:07:18 -07:00
Seth House
1382401618
Updated all the module index pages with the latest/newest modules
2015-03-02 13:59:19 -07:00
Seth House
b001cb6534
Added engine modules to modules index in docs
2015-03-02 13:49:17 -07:00
C. R. Oldham
f171df4311
Merge forward 2015.2->develop
2015-03-01 19:54:22 -07:00
C. R. Oldham
00942f2060
Merge forward 2014.7->2015.2
2015-03-01 17:55:25 -07:00
