valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
62,363 Commits 24 Branches 182 Tags 341 MiB
248c090af2
Commit Graph

5263 Commits

Author SHA1 Message Date
Gary Waters
f96d39483d updated the tutorial with gravyboat's suggestions 2015-10-23 17:09:49 -07:00
Gary Waters
b1f4a2bdf4 i think i changed the wrong header, updated to fix 2015-10-23 15:45:17 -07:00
Gary Waters
846b3aece1 I found you can not run the cp.push commands until after enabling the feature in the conf, so I wanted to update the docs so others who try these commands wont bump into the same issue I had. 2015-10-23 15:34:31 -07:00
Forrest Alvarez
aa0d4d406e Fix a spelling error. 2015-10-23 14:58:19 -07:00
Forrest Alvarez
6dde4e01c0 Update the pillar tutorial to talk about nested pillar values. 2015-10-23 14:57:11 -07:00
Jeremy McMillan
aef680fd73 Documentation update for DigitalOcean create_dns_record config option 2015-10-23 16:43:12 -04:00
Mike Place
00c4c64c60 Merge pull request #28208 from jacksontj/develop 
Clearer documentation of the multiprocessing option
 2015-10-23 07:42:40 -06:00
Dmitry Kuzmenko
7a5204ef02 Deprecate client_acl with publisher_acl (rename) 
Keeping client_acl support
 2015-10-23 11:59:40 +03:00
rallytime
8b06ab4335 Add documentation to supply the ssh_username: freebsd config to DO docs 
Fixes #28230
 2015-10-22 15:24:39 -06:00
Zach Malone
2bc17047b2 Adding double quote notes 
false and no or true and yes values need to be wrapped in double quotes (' and " together), which was not previously noted in the docs.
 2015-10-22 12:39:14 -06:00
Thomas Jackson
cfb768ac30 Clearer documentation of the multiprocessing option 2015-10-22 08:45:54 -07: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
b3f3275e0a Merge pull request #28163 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-10-21 16:46:40 -06:00
Mike Place
b5550fcf76 Merge pull request #28159 from plastikos/improvement-check_cmd_docs 
Improve documentation of `check_cmd`.
 2015-10-21 07:21:13 -06:00
Mike Place
508e63237b Merge pull request #28090 from Pixcell/develop 
Add clone for qemu
 2015-10-21 07:19:16 -06:00
root
73b8e85a96 Update doc 2015-10-21 05:45:28 -04:00
Colton Myers
a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/config/__init__.py
    salt/modules/git.py
    salt/modules/hosts.py
    salt/modules/htpasswd.py
    salt/states/boto_secgroup.py
    salt/states/htpasswd.py
    tests/unit/modules/schedule_test.py
 2015-10-20 18:13:11 -06:00
Colton Myers
c4c889f97b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    salt/daemons/masterapi.py
    salt/minion.py
 2015-10-20 14:47:49 -06:00
Nicole Thomas
53dd01fc24 Merge pull request #28149 from pass-by-value/proxmox_profile_doc_change 
Add clarification to cloud profile doc about host
 2015-10-20 13:46:05 -06:00
Thayne Harbaugh
7f8d5a56d1 Improve documentation of check_cmd. 
* Make the distinction between requisite `check_cmd` and `file.managed`
  `check_cmd`.

* Be more clear about `file.managed` `check_cmd`, the temporary file,
  and when the new contents are written or discarded.

* In requisite `check_cmd` use a concise `!` rather than the awkward
  `&& exit 1 || exit 0`.

* A few minor, stylistic changes.
 2015-10-20 13:44:06 -06:00
Aditya Kulkarni
bc371c55cd Add clarification to cloud profile doc about host 2015-10-20 15:17:47 -04:00
Mike Place
572487073c Merge pull request #28096 from rallytime/bp-28061 
Back-port #28061 to 2015.8
 2015-10-20 10:15:34 -06:00
rallytime
458a544d83 Add OpenBSD installation documentation to 2015.5 branch 2015-10-20 09:13:28 -06:00
Antoine Jacoutot
bc9159a126 OpenBSD salt package: update list of dependencies. 2015-10-20 09:07:43 -06:00
Mike Place
830ad8b3a9 Merge pull request #28103 from ajacoutot/openbsd-doc 
OpenBSD salt package: update list of dependencies.
 2015-10-20 08:55:53 -06:00
Bogdan Radulescu
c9e8228f3c Documented import_keypair for the ec2 driver 2015-10-20 12:41:28 +00:00
C. R. Oldham
1085eeab2b Merge pull request #27922 from cro/fx2 
WIP States/Modules for managing Dell FX2 chassis via salt-proxy
 2015-10-19 17:29:21 -06:00
C. R. Oldham
3712066fc9 More docs. 2015-10-19 13:19:20 -06:00
Aditya Kulkarni
7c8f236115 Add documentation for proxy minion ssh 2015-10-19 13:30:35 -04:00
Antoine Jacoutot
4c35e8182f OpenBSD salt package: update list of dependencies. 2015-10-19 19:01:26 +02:00
Michael Vogel
cb8a72d580 Fix #28060 
Correct the `pip` command. install should be getting `global-options` not `pip` itself.
 2015-10-19 09:54:12 -06:00
Mike Place
1db6406bef Merge pull request #28013 from rallytime/bp-27891 
Back-port #27891 to 2015.8
 2015-10-19 06:57:51 -06:00
Mike Place
26b3e01dda Merge pull request #28018 from rallytime/fix-27938 
Add example to Writing Grains of how grains can be loaded twice
 2015-10-19 06:47:10 -06:00
Mike Place
ce29415c8f Merge pull request #28061 from LoveIsGrief/28060_doc_default_paths 
Fix #28060 - Default paths for test environment
 2015-10-19 06:35:22 -06:00
Miguel Angel Guillén
f4422eb04d Fix Doc in jinja template, 
In the example expr_form is using pillar instead of grain when in the doc is explained the use of a grain for the role
 2015-10-19 11:59:26 +02:00
Michael Vogel
fc8d51aa5c Fix #28060 
Correct the `pip` command. install should be getting `global-options` not `pip` itself.
 2015-10-17 18:35:18 +02:00
C. R. Oldham
4ce2f8bb11 Documentation. 2015-10-16 16:52:14 -06:00
Justin Findlay
ae92a8a1dc fix repo path in ubuntu installation documentation 
Fixes #28038.
 2015-10-16 13:29:18 -06:00
Jacob Hammons
05927bb6f0 Updated release notes with additional CVE information 2015-10-16 10:18:42 -06:00
Jacob Hammons
0d1b691549 Updated release notes with additional CVE information 2015-10-16 10:12:12 -06:00
Jacob Hammons
e4d7df8695 Updated Debian and Ubuntu repo paths with new structure for 2015.8.1 2015-10-16 09:22:48 -06:00
rallytime
c23af0d8e2 Clarify loading vs rendering the final grains data structure 2015-10-16 06:43:24 -06:00
rallytime
a4d7fb7e60 Add example to Writing Grains of how grains can be loaded twice 
Fixes #27938
 2015-10-16 06:26:59 -06:00
Domingo Kiser
4af5b5c33f introduce recurse_list pillar_source_merging_strategy 2015-10-16 05:24:40 -06:00
Jacob Hammons
2870af2ba3 added link to grains security FAQ to targeting and pillar topics. 2015-10-15 15:05:35 -06:00
Jacob Hammons
bb61c68c11 Changed current release to 5.6 and added CVE to release notes 2015-10-15 11:19:11 -06:00
Jacob Hammons
236992b2be Changed current release to 8.1 and added CVEs to release notes 2015-10-15 11:14:50 -06:00
Colton Myers
6537da77fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/grains/core.py
    salt/loader.py
    salt/minion.py
    salt/modules/dockerng.py
    salt/modules/rest_package.py
    salt/modules/ssh.py
    salt/modules/state.py
    salt/modules/timezone.py
    salt/modules/zypper.py
    salt/runners/state.py
    salt/state.py
    salt/states/virtualenv_mod.py
    salt/utils/cloud.py
 2015-10-13 17:27:48 -06:00
rallytime
13a9bc9053 Use eipalloc instead of eni in EC2 interface properties example 
Fixes #27815
 2015-10-13 14:46:01 -06:00
Mike Place
dd92b8a2e3 Merge pull request #27874 from rallytime/deprecation-docs 
Add mention of Periodic Table naming scheme to deprecation docs
 2015-10-13 08:51:45 -06:00
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