Domingo Kiser
a8adaa8f9e
introduce recurse_list pillar_source_merging_strategy
2015-10-12 21:59:39 -07:00
C. R. Oldham
5b33df9d19
Add docs for 2015.8.2+ changes
2015-10-12 14:55:19 -06:00
rallytime
8c056ba501
Add mention of Periodic Table naming scheme to deprecation docs
2015-10-12 13:08:50 -06:00
Mike Place
2066201013
Merge pull request #26943 from richardhansen/ldap
...
New ldap state module and accompanying execution module
2015-10-12 10:59:08 -06:00
Steve Hajducko
5ff8a83009
Clarify argument usage for runners in reactors
...
Clarified that positional arguments don't work in runners currently and
that you must use keyword args. Fixes #27770
Also, modified the link to point at the function the example shows,
rather than the previous example.
2015-10-09 21:22:54 -07:00
Richard Hansen
9aa19575fa
new ldap state module
2015-10-09 17:47:56 -04:00
Richard Hansen
39abc94739
new ldap3 execution module
...
This is an alternative to the existing ldapmod module.
2015-10-09 17:47:56 -04:00
Colton Myers
9128e8e7ae
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/gce.py
salt/modules/daemontools.py
2015-10-07 13:14:28 -06:00
Colton Myers
69d960f8e6
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/man/salt.7
doc/topics/ssh/index.rst
salt/modules/boto_secgroup.py
salt/modules/dockerng.py
salt/states/archive.py
salt/states/boto_elb.py
salt/states/boto_secgroup.py
tests/unit/modules/schedule_test.py
2015-10-07 13:11:48 -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
Justin Findlay
03400ef45b
fix virtual fcn return doc indentation
...
Fixes #27724 .
2015-10-07 11:49:16 -06:00
Justin Findlay
4b9128b491
Merge pull request #27732 from jacobhammons/26673
...
update docs for __virtual__ and __virtualname__
2015-10-07 11:29:31 -06:00
Jacob Hammons
75cc07cf10
noted that __virtual__ can return False and an error string
2015-10-07 09:48:46 -06:00
Jacob Hammons
234a699e41
Updated saltstack2 theme to add SaltConf16 banner
2015-10-06 17:51:30 -06:00
Jacob Hammons
3a52d3606b
Updated saltstack2 theme to add SaltConf16 banner
2015-10-06 17:42:53 -06:00
Jacob Hammons
cbecd4f553
Updated saltstack2 theme to add SaltConf16 banner
2015-10-06 17:38:49 -06:00
Jacob Hammons
117e0c2bcc
Added hardening topic based on the information in Refs #27088
2015-10-06 17:36:54 -06:00
Jacob Hammons
b928e1afa8
update docs for __virtual__ and __virtualname__
...
Refs #26673
2015-10-06 17:23:42 -06:00
Justin Findlay
6bddf80546
update __virtual__ return documentation
...
Related to #26755 ; fixes #27116 ; implements part of #27643 .
2015-10-06 13:47:31 -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
1c51ce28a9
Update compound matcher docs to clarify the usage of alternate delimiters
...
Refs #26604
2015-10-05 17:29:39 -06:00
Jacob Hammons
5a3e72fc8e
__ops__ to __opts__
2015-10-05 15:00:56 -06:00
Jacob Hammons
5a9867aad1
initial engines topic, updates to windows repo docs
...
Refs #23239
Refs #27520
2015-10-05 14:22:59 -06:00
Gary Wright
84b6ee0c58
.pub as public key is what we should send to remote
2015-10-05 11:40:55 -06:00
Nicole Thomas
c70a576fe8
Merge pull request #27659 from gnubyexample/develop
...
.pub as public key is what we should send to remote
2015-10-05 11:08:20 -06:00
avinassh
bfa0acfbfe
Fix a typo
2015-10-05 08:58:51 -06:00
avinassh
e265ba8592
Fix a typo
2015-10-05 19:21:16 +05:30
Gary Wright
00baf21176
.pub as public key is what we should send to remote
2015-10-03 23:01:19 +01:00
Stephen Medina
a9063a9745
fix typo in default pillar path
...
I am a newb and this threw me off for a bit. Wanted to make it consistent with the rest of the doc.
2015-10-02 16:50:28 -06:00
Stephen Medina
afcc12bc9b
fix typo in default pillar path
...
I am a newb and this threw me off for a bit. Wanted to make it consistent with the rest of the doc.
2015-10-02 14:25:48 -07:00
rallytime
1d727a545d
Require Network Helper over entire account
...
Also fixed calling some functions so they don't stacktrace.
2015-10-02 12:30:19 -06:00
rallytime
a20462b9d9
Allow private ips to be used with the linode driver
...
Alos updated the docs to include more provider/profile options and how they're used.
2015-10-02 12:06:05 -06:00
Mike Place
eb59cb8d1c
Merge pull request #27614 from blueyed/doc-minor
...
doc: minor fixes to doc and comments
2015-10-02 09:34:02 -06:00
Jacob Hammons
1c8b32ce26
Updated windows software repository docs
2015-10-01 22:02:01 -06:00
Daniel Hahler
98a8c0f055
doc: minor fixes to doc and comments
2015-10-02 01:18:32 +02:00
rallytime
8dc047dc18
If external_up is set to None, don't stacktrace, just use the private ip.
2015-10-01 16:37:17 -06:00
Mike Place
c84a1edc1b
Merge pull request #27568 from jacobhammons/man-pages-five
...
regenerated man pages
2015-10-01 09:39:37 -06:00
Justin Findlay
f2eb20f26b
add autogenerated 2015.8.1 release notes
2015-09-30 22:51:36 -06:00
Jacob Hammons
ee4a3b3549
added changes list for 2015.8.1
2015-09-30 16:58:53 -06:00
Justin Findlay
4f0d55cda6
add 2015.5.6 release notes
2015-09-30 16:29:57 -06:00
Jacob Hammons
b59c03d20d
regenerated man pages
2015-09-30 13:32:58 -06:00
Jacob Hammons
cc37dc1087
updated version in salt.7
2015-09-30 13:01:11 -06:00
Jacob Hammons
a9dcb23a13
regenerated man pages for 2015.8.1
2015-09-30 12:58:34 -06:00
Justin Findlay
3727d79bad
edit mine doc for style and markup
2015-09-30 11:40:22 -06:00
Justin Findlay
7e037a4666
add doc motivating mine vs grains
...
Fixes #27518 .
2015-09-30 11:40:22 -06:00
Mike Place
a668c3543b
Merge pull request #27554 from pass-by-value/doc_sphinx_version
...
Update Sphinx version number in docs
2015-09-30 10:41:27 -06:00
Aditya Kulkarni
18868de6ea
Change Sphinx version number in docs
2015-09-30 11:46:06 -04:00
Mike Place
1f7ea7c764
Merge pull request #27517 from jacobhammons/install-docs
...
Updated install docs
2015-09-30 09:19:51 -06:00
Colton Myers
41cad702e3
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/minion.py
salt/modules/rest_service.py
salt/states/dockerng.py
salt/utils/cloud.py
2015-09-29 18:13:33 -06:00
Colton Myers
73b90f155e
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/cloud/gce.rst
doc/topics/windows/windows-package-manager.rst
salt/client/ssh/state.py
salt/cloud/clouds/ec2.py
salt/modules/defaults.py
salt/modules/file.py
salt/utils/cloud.py
2015-09-29 14:56:41 -06:00
Jacob Hammons
167fd2304e
Fixed a duplicated link ID
2015-09-29 14:08:48 -06:00
Jacob Hammons
c05fa71f91
Updated install docs
...
Refs #27281
Refs #27179
2015-09-29 12:07:50 -06:00
Mike Place
931f593b51
Merge pull request #27483 from rallytime/fix-17103
...
Outputters should sync to output, not outputters, on the minion.
2015-09-29 09:33:08 -06:00
Mike Place
9c2c028953
Merge pull request #27484 from rallytime/bp-27434-and-27470
...
Back-port #27434 and #27470 to 2015.5
2015-09-29 09:32:03 -06:00
Mike Place
5de2ee35ab
Minor doc fixup.
...
Language and grammar changes.
2015-09-28 17:19:21 -06:00
ZhiFeng Hu
af656c7e87
Doc: copy key to server via ssh-copy-id
...
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
2015-09-28 17:19:09 -06:00
rallytime
105528720b
Outputters should sync to output, not outputters, on the minion.
...
Otherwise, the loader won't pick them up.
Fixes #17103
2015-09-28 16:53:53 -06:00
Seth House
64b54e668a
Add fake pymongo version attribute for the docs
...
This bypasses the following traceback when building the docs.
File "/Users/shouse/src/salt/salt/salt/returners/mongo_future_return.py", line 72, in <module>
version = '.'.join(version.split('.')[:2])
TypeError: 'Mock' object has no attribute '__getitem__'
2015-09-28 13:51:31 -06:00
Mike Place
a49cdab950
Minor doc fixup.
...
Language and grammar changes.
2015-09-28 13:11:58 -06:00
twangboy
a996ea46e2
Added quotes to version numbers example
...
Fixes #27433
2015-09-28 12:52:59 -06:00
ZhiFeng Hu
58ea4550ba
Doc: copy key to server via ssh-copy-id
...
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
2015-09-26 22:55:00 +08:00
Joseph Hall
5dd1b70475
Merge pull request #27408 from rallytime/fix-27406-for-2015.5
...
Fix avail_locations function for the softlayer_hw driver in 2015.5
2015-09-25 17:34:50 -06:00
rallytime
39a4ae5a6c
Remove hdd: 19 refs from SL docs - no longer available from SoftLayer.
2015-09-25 12:54:25 -06:00
Jonathan Ballet
97e69ebb97
doc: fix state's top documentation typo
2015-09-25 12:16:48 -06:00
Jonathan Ballet
33db0c27f8
doc: fix RAET links
2015-09-25 12:16:47 -06:00
Jacob Hammons
a9fdecada1
Fix css layout Refs #27389
...
sample typo fix in linux_acl
additional module folders listed in dynamic-modules
2015-09-25 11:25:14 -06:00
Meggie Woodfield
1c779700f6
Adding stretch label definition
2015-09-25 10:59:07 -06:00
jacobhammons
24e665335d
Merge pull request #27399 from multani/fix/docs
...
Various documentation fixes
2015-09-25 09:42:52 -06:00
Jonathan Ballet
c4e7392a2b
doc: fix state's top documentation typo
2015-09-25 10:36:27 +02:00
Jonathan Ballet
45aecdbffd
doc: fix RAET links
2015-09-25 10:36:19 +02:00
Jonathan Ballet
79d8ff38ca
doc: fixed RST markup on Salt Cloud functions
2015-09-25 10:20:53 +02:00
Jonathan Ballet
fc8a1bc349
doc: remove duplicated Salt Cloud AWS section on Termination Protection
2015-09-25 10:20:53 +02:00
rallytime
08c04da48b
Document tty: True usage in salt-ssh roster file
...
Fixes #27354
2015-09-24 16:25:22 -06:00
Nicole Thomas
12a021da11
Merge pull request #27361 from cro/pxm_doc
...
Correct some issues with proxy minions
2015-09-24 10:03:38 -06:00
Nicole Thomas
06047ebc5a
Merge pull request #27324 from alxbse/vmware-standalone-esxi
...
Adds support for creating without cloning VMs in VMware driver
2015-09-24 08:52:18 -06:00
C. R. Oldham
928ef59a8a
Merge pull request #27349 from jfindlay/doc_typos
...
add freebsd install docs to release notes
2015-09-24 07:51:02 -06:00
Alexander Backlund
759c8863d1
Merge branch 'vmware-standalone-esxi' of https://github.com/alxbse/salt into vmware-standalone-esxi
...
Conflicts:
doc/topics/cloud/vmware.rst
salt/cloud/clouds/vmware.py
2015-09-24 07:22:06 -04:00
C. R. Oldham
3a297d8036
Add release notes for proxy fixes.
2015-09-23 18:42:00 -06:00
Alexander Backlund
5367949e3b
Expand documentation on VMware driver to explain more about creating a VM. Add power_on support when creating.
2015-09-23 17:21:29 -04:00
Colton Myers
c4965e14ea
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/modules/yumpkg.py
2015-09-23 14:36:09 -06:00
rallytime
2bf566d934
Allow IP-forwarding in GCE driver
...
Fixes #21390
2015-09-23 14:27:55 -06:00
rallytime
484015a7a3
Added version tag for ex_disk_type option
2015-09-23 14:21:17 -06:00
rallytime
a71ebc97b2
Allow use of rst header links by separating options out from yaml example
...
Also added docs to use the ex_disk_type option
2015-09-23 14:21:06 -06:00
C. R. Oldham
f4944fe68a
Fix typo in docs
2015-09-23 14:11:00 -06:00
Justin Findlay
e509cfca17
fix typo in 2015.8.0 pull list
2015-09-23 14:03:12 -06:00
Justin Findlay
7137e731d3
add FreeBSD documentation to 2015.8.0 notes
2015-09-23 14:03:12 -06:00
rallytime
1d3925bbfb
Added version tag for ex_disk_type option
2015-09-23 13:08:18 -06:00
rallytime
f23369300c
Allow use of rst header links by separating options out from yaml example
...
Also added docs to use the ex_disk_type option
2015-09-23 13:06:25 -06:00
alex
f418fa7c0e
Adds support for creating without cloning VMs. Makes it possible to manage standalone ESXi.
...
Fixes saltstack/salt#26902
2015-09-23 15:06:03 -04:00
Alexander Backlund
be6921954e
Adds support for creating VMs without cloning. Makes it possible to manage standalone ESXi.
...
Fixes saltstack/salt#26902
2015-09-23 07:06:25 -04:00
Colton Myers
ec6cd80496
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/man/salt.7
doc/ref/auth/all/index.rst
doc/ref/auth/all/salt.auth.rest.rst
doc/ref/beacons/all/index.rst
doc/ref/beacons/all/salt.beacons.ps.rst
doc/ref/pillar/all/index.rst
doc/ref/pillar/all/salt.pillar.consul_pillar.rst
doc/ref/pillar/all/salt.pillar.neutron.rst
doc/ref/pillar/all/salt.pillar.sql_base.rst
doc/ref/pillar/all/salt.pillar.sqlite3.rst
doc/ref/sdb/all/salt.sdb.rest.rst
salt/modules/rh_ip.py
salt/utils/http.py
2015-09-22 15:31:46 -06:00
Colton Myers
95e70f0bef
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/config.py
salt/minion.py
salt/modules/yumpkg.py
salt/runners/ssh.py
salt/states/git.py
salt/states/http.py
2015-09-22 15:20:17 -06:00
Colton Myers
7b75e4aed1
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-09-22 15:07:45 -06:00
Jacob Hammons
7ac98a03b6
Updated module doc index using https://github.com/saltstack/salt/pull/27203
2015-09-22 11:54:34 -06:00
rallytime
11a0a528a7
Make sure the VM can be deleted if it was created with use_fqdn
2015-09-22 11:45:27 -06:00
rallytime
9dcd11c155
Created a 'use_fqdn' flag to allow softlayer minion to use an FQDN as their minion id
2015-09-22 11:44:39 -06:00
rallytime
9b34542cb0
Filter on 'name', not 'id', when listing images
...
And fix doc example of what --list-images looks like
2015-09-21 14:35:22 -06:00
Justin Findlay
9061cccc4a
Merge pull request #27280 from snarfmonkey/develop
...
minion log_level default is 'info' not 'warning'
2015-09-21 13:27:32 -06:00
Joseph Hall
b11ce6ac2a
Merge pull request #27251 from rallytime/fix-19947
...
Add support for post_uri in SoftLayer cloud drivers
2015-09-21 09:43:16 -06:00
Ben Hosmer
3ce77db1bc
Fix typo in AWS doc config
2015-09-21 09:36:46 -06:00
Arnold Bechtoldt
3a7d31a91c
add missing module references
2015-09-20 13:22:32 +02:00
Justin Findlay
1a32b9f778
Merge pull request #27254 from jfindlay/version.2015.8
...
2015.2,2015.8,Beryllium -> 2015.8.0
2015-09-18 17:44:46 -06:00
Justin Findlay
8ea15f498e
2015.2,2015.8,Beryllium -> 2015.8.0
...
Some features were erroneously reported as being added in 2015.2.
2015-09-18 16:35:15 -06:00
rallytime
aafb776808
Add support for post_uri in SoftLayer cloud drivers
2015-09-18 16:24:51 -06:00
Justin Findlay
3d28307a00
2014.7 -> 2014.7.0
2015-09-18 16:08:47 -06:00
Mike Place
115c1ed8ec
Merge pull request #27211 from whiteinge/local_batch-client
...
Add local_subset client
2015-09-18 15:42:00 -06:00
Aaron S.
13f5f7bb3e
default log_level is info, not warning
...
see https://github.com/saltstack/salt/blob/develop/salt/config/__init__.py#L855
2015-09-18 13:59:45 -07:00
Aaron S.
3d866f773d
log_level default is info
...
see https://github.com/saltstack/salt/blob/develop/salt/config/__init__.py#L855
2015-09-18 13:59:01 -07:00
Justin Findlay
c9255f2bbd
Merge pull request #27236 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-09-18 13:55:49 -06:00
Colton Myers
9864d9e0fa
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/ref/modules/all/index.rst
doc/topics/releases/boron.rst
salt/cli/daemons.py
salt/cli/salt.py
salt/modules/jboss7.py
salt/states/file.py
2015-09-18 11:03:37 -06:00
Colton Myers
be2b0fc497
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/utils/http.py
2015-09-18 10:57:28 -06:00
Colton Myers
f4563ea9b7
Add stub release notes for 2015.5.6
2015-09-18 10:54:15 -06:00
Colton Myers
25410706ee
Add stub release notes for 2015.8.1
2015-09-18 10:51:54 -06:00
Ben Hosmer
5393751332
Fix typo in AWS doc config
2015-09-18 12:21:37 -04:00
Seth House
6be5745f61
Add local_subset client to docs
2015-09-17 18:03:04 -06:00
Colton Myers
9ddc88c6ba
Merge pull request #27198 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-09-17 15:33:15 -06:00
Justin Findlay
8b2cb330e3
Merge pull request #27203 from whiteinge/sphinx-apidoc-wrapper
...
Add script to run sphinx-apidoc against our module directories
2015-09-17 15:23:20 -06:00
rallytime
cced6e9031
Don't repeat GCE setup instructions, and make the use of .json files clearer
2015-09-17 15:07:49 -06:00
Seth House
fed627763b
Add script to run sphinx-apidoc against our module directories
...
The script itself is pretty inflexible so we're doing a little find &
sed trickery around it.
2015-09-17 14:22:12 -06:00
Colton Myers
8c204a45ab
Merge pull request #27197 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-09-17 13:53:22 -06:00
Colton Myers
26b6c92975
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/conf.py
salt/config/__init__.py
salt/modules/rh_ip.py
salt/pillar/s3.py
salt/returners/local_cache.py
salt/states/user.py
salt/templates/rh_ip/rh7_eth.jinja
2015-09-17 11:10:37 -06:00
Colton Myers
2c2a5f85ac
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/cloud/gce.rst
salt/cli/api.py
salt/cli/call.py
salt/cli/cp.py
salt/cli/key.py
salt/cli/run.py
salt/cli/salt.py
salt/modules/dockerio.py
salt/states/dockerio.py
2015-09-17 10:54:33 -06:00
Jacob Hammons
e56f02b025
re-add cheatsheet do-over
2015-09-17 09:32:52 -06:00
Jacob Hammons
60a8330561
re-added cheatsheet.tex
2015-09-17 09:29:09 -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
rallytime
531b44243d
Remove note - incorrect info
2015-09-16 19:30:03 -06:00
rallytime
fe74d203f5
Add the ability to specify multiple disks on the SoftLayer driver
...
Refs #19954
2015-09-16 16:46:02 -06:00
rallytime
a07db909bd
Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples
2015-09-16 12:51:47 -06:00
Jacob Hammons
7ed9f6260f
Updated key instruction on rhel7
2015-09-15 10:04:57 -06:00
Jacob Hammons
d1e8af9be6
added command to remove key from rhel6
2015-09-15 06:33:08 -06:00
Jacob Hammons
69d64f177d
moved rhel5 commands to separate lines
2015-09-15 06:30:45 -06:00
Jacob Hammons
90431278ea
Install instruction updates for rhel6 and debian
2015-09-15 06:29:09 -06:00
Justin Findlay
fc8afcc9f9
Merge pull request #27124 from jfindlay/bp-27123
...
Backport #27123
2015-09-15 02:37:43 -06:00
Justin Findlay
0d62d3470c
Merge pull request #27111 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-09-15 01:29:30 -06:00
Christer Edwards
016fb5fafe
Update freebsd.rst
...
fix URL, typ in saltstack repo config
2015-09-15 01:27:14 -06:00
Christer Edwards
026fc9a884
update for freebsd installation documentation
2015-09-15 01:27:14 -06:00
Christer Edwards
d55f3f79cb
Update freebsd.rst
...
fix URL, typ in saltstack repo config
2015-09-14 21:44:44 -06:00
Christer Edwards
ab53cd2970
update for freebsd installation documentation
2015-09-14 21:34:35 -06:00
Jacob Hammons
b69e11e0a4
made 2014.7 an archived release
...
minor doc site updates
2015-09-14 16:43:51 -06:00
Jacob Hammons
6e323b6dd3
Update latest to 2015.8, 2015.5 is now previous
...
Assorted style and minor updates
2015-09-14 16:32:22 -06:00
Jacob Hammons
42eaa80997
Restored missing css
2015-09-14 16:00:06 -06:00
Jacob Hammons
9ab642295e
Fixed a release notes typo and bad file rename
2015-09-14 15:51:37 -06:00
Jacob Hammons
daa3f4eee0
Updated release notes, change 2015.8 to latest release for doc site
2015-09-14 15:17:59 -06:00
Colton Myers
896313bff0
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/pillar/s3.py
2015-09-14 15:01:41 -06:00
Jacob Hammons
d939a38c8c
release notes updates
2015-09-14 14:52:14 -06:00
Colton Myers
274464a85b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/reactor/index.rst
salt/cloud/clouds/digital_ocean_v2.py
salt/modules/groupadd.py
salt/modules/localemod.py
salt/modules/mysql.py
salt/modules/useradd.py
salt/modules/win_pkg.py
salt/modules/win_useradd.py
salt/netapi/rest_cherrypy/app.py
salt/pillar/s3.py
salt/returners/local_cache.py
salt/states/htpasswd.py
salt/states/user.py
2015-09-14 14:39:03 -06:00
Joseph Hall
ee0c8955dd
Document develoment of SPM loader modules
2015-09-12 11:14:47 -06:00
Arnold Bechtoldt
b9e5095bf5
add GH issue label SPM to docs
2015-09-12 11:14:26 +02:00
rallytime
76c056d02b
Remove "use develop branch" warning from LXC tutorial now that 2015.5.0 has been released
2015-09-11 16:05:28 -06:00
rallytime
a0de117a0f
Merge branch '2015.8' into develop
...
Conflicts:
salt/cloud/__init__.py
salt/cloud/clouds/proxmox.py
salt/config/__init__.py
2015-09-11 09:33:21 -06:00
rallytime
cb641f8145
Update softlayer docs for where to find apikey
2015-09-10 16:23:47 -06:00
Nicole Thomas
37814f5dff
Merge pull request #26996 from jacobhammons/beacon-doc
...
Beacon doc updates
2015-09-10 10:47:49 -06:00
Jacob Hammons
e475ea688e
Fixed typo
2015-09-09 13:41:48 -06:00
Nicole Thomas
3e902e86b1
Merge pull request #26987 from rallytime/bp-26966
...
Back-port #26966 to 2015.5
2015-09-09 12:42:51 -06:00
Justin Findlay
9aaca9338e
generate pull request list v2015.8..v2015.8.0
...
Also remove the changelogs generated for rc2 and rc3 in favor of a
unified list that shows all merged pull requests between the forking of
the 2015.8 branch and the release of 2015.8.0.
2015-09-09 12:41:09 -06:00
Jacob Hammons
2401533d9e
New content added to beacon docs.
2015-09-09 11:16:55 -06:00
David Boucha
308d9b1408
Merge pull request #26980 from terminalmage/winrepo-unique-name
...
Use human-readable cachedirs for gitfs-backed winrepo
2015-09-09 11:02:13 -05:00
TheBigBear
6a29eac003
URL has changed
...
the saltstack windows download area has moved over to https on https://repo.saltstack.com/windows/
2015-09-09 08:59:19 -06:00
Erik Johnson
415c001a38
Add link to winrepo.update_git_repos runner function for consistency.
2015-09-09 09:04:52 -05:00
Erik Johnson
1dd77e7003
Fix misspelled word
2015-09-09 09:02:55 -05:00
Erik Johnson
d05e7b0875
Add information on winrepo cachedir name overrides
2015-09-09 05:44:15 -05:00
Erik Johnson
a45bb90230
Remove block describing hashed winrepo cachedirs
...
The behavior has now changed so this information is inaccurate.
2015-09-09 05:44:15 -05:00
rallytime
0214daad19
Fix a couple of typos in reactor docs
2015-09-08 14:52:38 -06:00
TheBigBear
21ea2f6b1b
URL of salt windows downloads has changed
2015-09-08 21:43:59 +01:00
TheBigBear
c1e39a15d7
URL has changed
...
the saltstack windows download area has moved over to https on https://repo.saltstack.com/windows/
2015-09-08 21:21:17 +01:00
Pedro Algarvio
28069faffb
Remove the /etc/salt prefix
...
Closes #26890
2015-09-08 17:26:48 +01:00
Pedro Algarvio
c586e43f63
Merge branch 'bootstrap-command-line-help-doc-update' of https://github.com/bradthurber/salt into bradthurber-bootstrap-command-line-help-doc-update
2015-09-08 17:13:47 +01:00
rallytime
00fe6a225c
Fix minor doc typo in client api
2015-09-07 12:55:39 -06:00
Colton Myers
307d3d05a4
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/man/salt.7
salt/modules/yumpkg.py
2015-09-03 14:24:45 -06:00
Brad Thurber
0004bf803f
salt bootstrap tutorial docs are out-of-date compared with the actual utility help (-h)
2015-09-03 14:20:04 -04:00
Jacob Hammons
ac3bd47440
states/pkgrepo examples, suse installation updates
...
Refs #26644
Refs #26638
2015-09-02 11:37:40 -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
Colton Myers
278e8dda5b
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/gce.py
2015-09-01 15:15:13 -06:00
Jacob Hammons
5cca52a3c1
Fixed windows installer paths
...
Refs #25567
2015-08-31 20:20:44 -06:00
Jacob Hammons
0ec036350d
Updates to salt-ssh and salt-key
...
#24510
2015-08-31 20:00:30 -06:00
Jacob Hammons
992edc3bb8
Doc bug fixes
...
Refs #26192
Refs #26638
Refs #26644
Refs #26108
2015-08-31 16:05:50 -06:00
Jacob Hammons
06ac3bed42
Fixed typo
2015-08-31 13:53:59 -06:00
Jacob Hammons
45c1ff3543
Add doc for __states__ to writing states topic and 2015.8 release notes. Also added a missing line in release notes for git module updates.
...
Refs #21214
2015-08-31 13:51:31 -06:00
rallytime
d53754f2b7
Update Saltify docs to be more accurate and helpful
2015-08-31 12:02:23 -06:00
Colton Myers
1bbe45538e
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/__init__.py
salt/modules/smartos_vmadm.py
salt/utils/s3.py
setup.py
2015-08-28 16:44:08 -06:00
C. R. Oldham
65ae57310c
Fix typo in some draw object labels
2015-08-28 12:49:16 -06:00
Joseph Hall
116e345cb0
Document top_level_dir
2015-08-27 14:57:25 -06:00
Joseph Hall
f4723efe68
Add SPM paths into mainline Salt configs
2015-08-27 12:21:53 -06:00
Colton Myers
735aa8eb5e
Merge pull request #26684 from techhat/spmreactor
...
Add reactor formulas to spm
2015-08-26 16:45:47 -06:00
Joseph Hall
2eef80414a
Document reactor packages
2015-08-26 14:59:01 -06:00
Colton Myers
76c70162db
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/conf.py
doc/topics/spm/index.rst
salt/cloud/clouds/gce.py
salt/cloud/clouds/opennebula.py
salt/cloud/clouds/openstack.py
tests/unit/states/file_test.py
2015-08-26 14:47:33 -06:00
Colton Myers
ef76404def
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/releases/2015.5.5.rst
2015-08-26 14:32:03 -06:00
Colton Myers
40718af1d5
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
doc/conf.py
salt/modules/win_service.py
tests/integration/cloud/providers/digital_ocean.py
2015-08-26 14:29:57 -06:00
Colton Myers
09d0602d04
Merge pull request #26674 from rallytime/bp-26583
...
Back-port #26583 to 2015.8
2015-08-26 13:01:47 -06:00
Joseph Hall
e4dcef5048
Document SPM package types
2015-08-26 12:21:28 -06:00
Jeremy Rosenbaum
763ee20713
documentation for zip archive modules
2015-08-26 12:18:57 -06:00
Mike Place
d129bf4961
Merge pull request #26657 from jfindlay/top_lint
...
top file compilation fixes
2015-08-26 10:00:34 -06:00
Jacob Hammons
905a045b8d
update version for latest stable
2015-08-26 08:18:36 -06:00
Jacob Hammons
b6af538070
version change for latest branch
2015-08-26 08:02:54 -06:00
jacobhammons
a04d243471
Merge pull request #26662 from jacobhammons/version
...
update version to 2015.5
2015-08-26 07:45:44 -06:00
Jacob Hammons
4e5766fdde
update version to 2015.5
2015-08-26 07:45:08 -06:00
TheBigBear
1d5395b27a
minor doc edits - spelling
2015-08-26 12:11:50 +01:00
Justin Findlay
1d404bd561
remove trailing whitespace in state top docs
2015-08-26 01:44:33 -06:00
Justin Findlay
a288962ac2
change md code quoting to rst in state top docs
2015-08-26 01:44:33 -06:00
