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
67,228 Commits 24 Branches 182 Tags 341 MiB
42cb261105
Commit Graph

5743 Commits

Author SHA1 Message Date
Benjamin Drung
213fc2d858 Fix typo occuring -> occurring 2016-02-04 12:59:07 +01:00
Denys Havrysh
8bc2426816 Update example in master config documentation reference 2016-02-04 13:58:41 +02:00
Benjamin Drung
fe6124003b Fix typo nonexistant -> nonexistent 2016-02-04 12:58:20 +01:00
Benjamin Drung
56ce7479b1 Fix typo catched -> caught 2016-02-04 12:57:20 +01:00
Benjamin Drung
821e690e65 Fix typo develoment -> development 2016-02-04 12:56:14 +01:00
Benjamin Drung
b51279e086 Fix typo overide -> override 2016-02-04 12:55:35 +01:00
Benjamin Drung
4f2f04ea7d Fix typo relevent -> relevant 2016-02-04 12:54:45 +01:00
Benjamin Drung
bf92c3663b Fix typo formating -> formatting 2016-02-04 12:45:19 +01:00
Benjamin Drung
cd72b12161 Fix typo thats -> that's 2016-02-04 12:39:41 +01:00
Benjamin Drung
6db9724ec7 Fix typo doesnt -> doesn't 2016-02-04 12:38:29 +01:00
Benjamin Drung
58d46a7e98 Fix typo certficate -> certificate 2016-02-04 12:34:50 +01:00
Thomas S Hatch
715d3e274f clarify that this is not final for this release 2016-02-03 21:20:25 -07:00
Thomas S Hatch
5e5ced1c66 add initial thorium docs 2016-02-03 18:34:17 -07:00
Colton Myers
984ad7ea8b Add documentation for whitelist 2016-02-03 12:29:11 -07:00
Colton Myers
0c8e57852b Add minion_blackout documentation 2016-02-03 12:13:15 -07:00
Denys Havrysh
6648fd4c62 Correct links to Fedora COPR repositories 2016-02-03 14:38:50 +02:00
Denys Havrysh
083037fccc Remove duplicate post-installation tasks section 2016-02-03 14:29:25 +02:00
jacobhammons
f1cf027308 Merge pull request #30841 from jacobhammons/release-notes 
Release notes for 2015.8.5
 2016-02-02 17:04:04 -07:00
Jacob Hammons
6d0562ef86 Release notes for 2015.8.5 2016-02-02 17:02:50 -07:00
jacobhammons
e0901854ce Merge pull request #30837 from jacobhammons/release-notes 
Added known issue #30820 to release notes
 2016-02-02 15:33:43 -07:00
Jacob Hammons
29e12a7fef Added known issue #30820 to release notes 2016-02-02 15:32:27 -07:00
Mike Place
b512c7757a Merge pull request #30832 from rallytime/fix-28790 
Add grains modules to salt modindex
 2016-02-02 14:47:46 -07:00
rallytime
ca044dd201 Add grains modules to salt modindex 
Fixes #28790
 2016-02-02 13:35:49 -07:00
Mike Place
bc0ffa840f Merge pull request #30825 from rallytime/doc-fixes 
Fix some autodoc import warnings from building docs
 2016-02-02 13:21:08 -07:00
Jacob Hammons
c95bb60148 Version to 2015.8.4 2016-02-02 13:05:42 -07:00
Jacob Hammons
fca119fe80 Updated man pages, version to 2015.8.4, added CVE 2016-1866 to release notes 2016-02-02 13:04:34 -07:00
jacobhammons
d24b9f1ea1 Merge pull request #30827 from jacobhammons/release-2015.8 
Version to 2015.8.4, added CVE 2016-1866 to release notes
 2016-02-02 13:03:31 -07:00
Jacob Hammons
dfc1f7a57d Version to 2015.8.4, added CVE 2016-1866 to release notes 2016-02-02 13:02:19 -07:00
rallytime
cdc7957808 Fix some autodoc import warnings from building docs 2016-02-02 12:19:38 -07:00
rallytime
6375aa2be3 Add new dimension data to doc list 2016-02-02 09:00:01 -07:00
Nicole Thomas
6ad59e78c5 Merge pull request #30767 from tonybaloney/feature/dimension_data_cloud 
Add saltcloud module for Dimension Data Cloud
 2016-02-02 08:55:34 -07:00
anthony-shaw
a61e7fbef3 Documentation for the driver 2016-02-02 14:20:08 +11:00
twangboy
fe0747c14e Fix another typo 2016-02-01 18:38:59 -07:00
twangboy
2815efc522 Fixes spelling 2016-02-01 18:36:23 -07:00
twangboy
6027e1ec53 Updates documentation to reflect new features 2016-02-01 18:32:56 -07:00
Mike Place
d9bf97fb16 Merge pull request #30793 from jacobhammons/release-2015.5 
Versioned latest release to 2015.8.4
 2016-02-01 14:52:43 -07:00
Jacob Hammons
c41e6bf981 Versioned latest release to 2015.8.4 2016-02-01 14:13:08 -07:00
Jacob Hammons
b192a9ba38 Doc restructuring, organization, and cleanup. Updated the doc navigation. 2016-01-31 20:10:02 -07:00
Thomas S Hatch
9e8af2f994 Merge pull request #30686 from cachedout/pillar_cache_2015_8 
Master-side pillar caching
 2016-01-31 11:52:47 -07:00
Colton Myers
967e862027 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/loader.py
    salt/modules/npm.py
    salt/pillar/__init__.py
 2016-01-29 15:51:52 -07:00
Jorge Schrauwen
d003d3c5b3 add missing docs for mdata 2016-01-29 16:25:51 +00:00
rallytime
86c3f2016e Fix-up autodoc proxy modules for consistency 
And to make sure everything is displayed in the module index
 2016-01-28 12:33:07 -07:00
Mike Place
02d8ff626a Pillar cache for master 
Entry point for pillar cache

Working msgpack implementation along with in-memory

Remove debugging

Perms for pillar cache creation

Documentation and small typo fix

Additional documentation note in master config

A note on pillar caching in the documentation on scaling

Backport of pillar cache to 2015.8 branch

Fixed ext pillar with debug

Lint
 2016-01-28 09:44:29 -06:00
Colton Myers
9b28b09fde Merge pull request #30634 from MorphBonehunter/develop 
Renaming salt-ssh option and documentation fix
 2016-01-27 16:50:11 -07:00
Colton Myers
0ee078eaf1 Merge pull request #30647 from terminalmage/issue11304 
Allow custom types to sync to the master
 2016-01-27 15:35:01 -07:00
Colton Myers
c15999edd9 Merge pull request #30428 from davisj/pillar_cache 
Add pillar_cache functionality to minion.
 2016-01-27 14:28:08 -07:00
Erik Johnson
1aa7c611c8 Add additional clarification re: saltutil runner to boron release notes 2016-01-27 15:10:06 -06:00
Clark Perkins
bfec052e7d Added some extra documentation 2016-01-27 11:45:22 -06:00
Erik Johnson
5b48362adb Improve docstrings and instructions on how to sync 
This also removes an unused argument from salt.modules.saltutil.sync_sdb().
 2016-01-26 17:48:12 -06:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop' 
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
 2016-01-26 16:19:39 -07:00
Erik Johnson
adaf3625c2 Add extension_modules change to Boron release notes 2016-01-26 14:41:39 -06:00
Erik Johnson
dcf5ed6369 Add information about change to extention_modules 2016-01-26 14:41:39 -06:00
Erik Johnson
c93b693f4c Add saltutil runner to docs toctree 2016-01-26 14:41:39 -06:00
Jake Davis
1b96a3e7e4 Merge branch 'develop' of https://github.com/saltstack/salt into pillar_cache 2016-01-26 13:43:00 -05:00
Jake Davis
4cbf49d487 Rename 'pillar_cache' as 'minion_pillar_cache.' 2016-01-26 10:14:35 -05:00
Daniel Wendler
e38f1fba3f Renaming salt-ssh option and documentation fix 
For consistency the wipe_ssh option is renamed in ssh_wipe as all other
options in the salt-ssh command are in this style.
The documentation was also adjusted to reflect the renaming.
There were also an wrong salt-ssh example in the documentation.
 2016-01-26 08:36:13 +01:00
Colton Myers
330ea9a292 Merge pull request #30622 from rallytime/fix-30621 
Add glance state to list of state modules
 2016-01-25 16:55:54 -07:00
Justin Findlay
b5e2cff028 doc.topics.eauth: clarify client_acl vs eauth 
Fixes #30587.
 2016-01-25 14:32:34 -07:00
rallytime
57b7e6cc93 Add glance state to list of state modules 
Fixes #30621
 2016-01-25 12:35:19 -07:00
Nicole Thomas
653292ec88 Merge pull request #30555 from twangboy/mac_brew 
renamed brew.py to mac_brew.py
 2016-01-25 12:30:31 -07:00
twangboy
9280603549 Updated release notes for boron to reflect filename changes 2016-01-25 11:32:57 -07:00
Nicole Thomas
05349071dc Merge pull request #30503 from StackPointCloud/profitbricks-cloud-provider 
Adds cloud provider support for ProfitBricks
 2016-01-25 11:28:41 -07:00
Justin Findlay
e4043403e4 add 2015.8.4 release notes 2016-01-25 11:10:07 -07:00
Ethan Devenport
de7d1666f6 Updates made after PR review: 
* Improved and cleaned up documentation.
* Removed unnecessary namespaces.
* Made to fail when no ssh_host is found.
* Cleared pylint violations.
 2016-01-25 18:02:10 +00:00
Nicole Thomas
89b4f3de1b Merge pull request #30609 from seanjnkns/backport_30602 
Fix documentation for pillar_merge_lists which default is False, not …
 2016-01-25 10:15:45 -07:00
Nicole Thomas
eb771585f9 Merge pull request #30602 from seanjnkns/pillar_merge_lists-doc-bug 
Fix documentation for pillar_merge_lists which default is False, not …
 2016-01-25 09:54:52 -07:00
Nicole Thomas
afdbb745c6 Merge pull request #30581 from JacobCWard/develop 
Fixes #30569
 2016-01-25 09:36:03 -07:00
Nicole Thomas
a7ba2df5e2 Merge pull request #30589 from terminalmage/2015.5-2015.8 
Merge 2015.5 into 2015.8
 2016-01-25 09:20:41 -07:00
Sean Jenkins
9924acdc43 Fix documentation for pillar_merge_lists which default is False, not True. From PR #30062 2016-01-25 08:57:39 -07:00
Sean Jenkins
841192ee2d Fix documentation for pillar_merge_lists which default is False, not True. From PR #30062 2016-01-25 08:49:13 -07:00
Nicole Thomas
09f9f78d94 Merge pull request #30534 from rmohr/copr 
COPR project moved
 2016-01-25 08:39:34 -07:00
Jonathan Ballet
4062c63b9f Fix doc formatting for yaml_idiosyncrasies 2016-01-25 12:26:30 +01:00
Jonathan Ballet
a329adfb21 Add missing salt.queues.* documentation 2016-01-25 12:19:21 +01:00
Jonathan Ballet
2465cf4ba5 Remove non-existing documentation 
This removes warnings during the documentation compilation
 2016-01-25 12:19:21 +01:00
Jonathan Ballet
276eb3a843 Fix GCE documentation 2016-01-25 12:19:21 +01:00
Erik Johnson
d649551fbf Merge branch '2015.5' into 2015.5-2015.8 2016-01-24 11:55:09 -06:00
Roman Mohr
044fe44ae9 COPR project moved 
Replace old url http://copr.fedoraproject.org with
https://copr.fedorainfracloud.org to fix broken bootstrap script.
 2016-01-24 18:43:02 +01:00
Jacob Ward
40d9e6f505 Fixes #30569 2016-01-23 16:47:40 -07:00
Colton Myers
9885976ac3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.yumpkg.rst
    salt/modules/yumpkg.py
 2016-01-22 12:59:54 -07:00
Jacob Hammons
03c51bb54d Added placeholder release notes for 2015.5.10 
Changed old doc links from docs.saltstack.org to docs.saltstack.com
 2016-01-22 10:48:08 -07:00
Mike Place
05d05263ab Merge pull request #30532 from whiteinge/slsutil-mod 
Add execution module for working in sls files
 2016-01-22 10:25:16 -07:00
Seth House
a57d9984e4 Add slsutil to doc index 2016-01-22 09:45:45 -07:00
Andrew Colin Kissa
806823315e Add postgres_initdb state module documentation 2016-01-22 12:21:03 +02:00
Erik Johnson
a118eb5d2e Merge branch '2015.5' into 2015.5-2015.8 2016-01-22 01:20:27 -06:00
Colton Myers
cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/configuration/master.rst
    doc/topics/cloud/linode.rst
    salt/cloud/clouds/linode.py
    salt/modules/rh_ip.py
    salt/renderers/pyobjects.py
    salt/states/file.py
 2016-01-21 17:42:50 -07:00
Mike Place
587a03e1d8 Merge pull request #30466 from s0undt3ch/hotfix/stop-deprecating-and-fix-opts-id 
Stop the deprecation path started in 0.17 about ext_pillar
 2016-01-21 15:58:36 -07:00
Mike Place
359b5267ac Merge pull request #30509 from abednarik/dependencies_doc_update 
Updated dependencies documentation.
 2016-01-21 15:54:31 -07:00
Mike Place
15c7aedd46 Merge pull request #30508 from rallytime/linode-clone-fixes 
Fix Linode driver cloning functionality
 2016-01-21 15:53:36 -07:00
Ethan Devenport
44491f69cf Adds cloud provider support for ProfitBricks Cloud Computing Infrastructure Services. 2016-01-21 22:52:25 +00:00
Jorge Schrauwen
2ad5fc1a75 enable doc generation for solaris_system 2016-01-21 19:40:44 +00:00
abednarik
4f8de47723 Updated dependencies documentation. 
Added tornado and futures in Quick Install and Installing Salt for Development
sections.

Fixes #30467
 2016-01-21 14:43:00 -03:00
rallytime
d26ed74bde Make sure the correct profile parameters are being checked when cloning 2016-01-21 10:29:48 -07:00
Erik Johnson
330e26d1da Hide get_locked_packages 2016-01-21 09:56:13 -06:00
Jake Davis
60f7e3ea01 Fixed chmod lint issue. Added notices about security implications. 2016-01-21 10:39:31 -05:00
Jake Davis
616e9c3f2b Add pillar_cache functionality to minion. 
Allows minon to save rendered pillar data to cachedir for later use
when file_client is set to local.
 2016-01-21 10:39:31 -05:00
Pedro Algarvio
bf7ce7c098 Stop the deprecation path started in 0.17 about ext_pillar 
The ``ext_pillar`` functions **must** now accept a minion ID as the first argument.
This stops the deprecation path started in Salt 0.17.x. Before this minion ID first argument was introduced, the minion ID could be retrieved accessing ``__opts__['id']`` loosing the reference to the master ID initially set in opts.
This is no longer the case, ``__opts__['id']`` will be kept as the master ID.
 2016-01-21 14:33:23 +00:00
rallytime
1d7e229377 Fix Linode driver cloning functionality. 
Fixes #30432
Fixes #30444

- Various clean-up of the driver, particularly in the create function.
- Restores cloning functionality, as this was completely broken in 2015.8.3
- Changes the requirement to set a config_id for cloned VMs (not necessary
for clones as the config_id is already set via the to-be-cloned profile)
- Updates docs to use the -F bootstrap script arg in addition to -C when
cloning from a VM that already has salt installed on it.
 2016-01-20 17:05:20 -07:00
Mike Place
2b7d20cee7 Merge pull request #30457 from rallytime/fix-22820 
Remove fsutils references from modules list
 2016-01-20 09:43:50 -07:00
Mike Place
73f372dc98 Merge pull request #30458 from rallytime/bp-30062 
Back-port #30062 to 2015.8
 2016-01-20 09:40:22 -07:00
Jacob Hammons
2b7f96bf0e Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron 2016-01-19 21:57:45 -07:00
Tim Harper
721c1c871b make note of s3 role assumption in upcoming changelog 2016-01-19 20:38:21 -07:00
Sean Jenkins
9665d9655f Set (pillar_)merge_lists to default for PR#30062 2016-01-19 15:06:50 -07:00
Sean Jenkins
e44a30620b Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead 2016-01-19 15:06:30 -07:00
rallytime
3288ff104d Remove fsutils references from modules list 
Fixes #22820
 2016-01-19 14:41:02 -07:00
Jacob Hammons
238ccba640 added tornado.netutil and tornado.stack_context to doc mock modules 2016-01-19 14:03:27 -07:00
Niels Abspoel
b55625c42a fix minor inconsistencies tampakrap suggested 2016-01-19 20:17:22 +01:00
Mike Place
30646f852f Merge pull request #30410 from aboe76/suse_repo_documentation 
update suse information regarding to repositories fixes #29194
 2016-01-19 11:51:01 -07:00
Jacob Hammons
3c4989327b added tornado.iostream to doc mock modules 2016-01-19 10:06:36 -07:00
Niels Abspoel
7ec32b2484 update suse information regarding to repositories 2016-01-16 12:16:10 +01:00
Colton Myers
19bc7b6ed4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2016-01-15 09:24:10 -07:00
Colton Myers
4cc9422bf8 Merge pull request #30373 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-01-15 09:23:38 -07:00
Colton Myers
5b53bf2597 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/linode.py
    salt/states/rabbitmq_policy.py
 2016-01-14 16:23:29 -07:00
Jacob Hammons
891ddafcba Updated man pages for 2015.8.4, updated copyright to 2016 2016-01-14 16:17:27 -07:00
rallytime
39b49621ad Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/beacons/service.py
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/modules/ipset.py
  - salt/modules/npm.py
  - salt/modules/rpm.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/schedule.py
  - tests/unit/modules/state_test.py
 2016-01-14 13:33:53 -07:00
rallytime
df70afdaa3 Merge #30231 with updates to dependency documentation 2016-01-13 16:41:29 -07:00
C. R. Oldham
03262c432c Merge pull request #30347 from rallytime/merge-30231 
Merge #30231 with updates to dependency documentation
 2016-01-13 16:36:35 -07:00
rallytime
2beb75e49f Merge #30231 with updates to dependency documentation 2016-01-13 14:10:00 -07:00
Jacob Hammons
53d17f1f85 Changed examples to use the "example.com" domain instead of "mycompany.com" or "company.com" 2016-01-12 13:37:09 -07:00
Mike Place
4a6b53f329 Merge pull request #30268 from terminalmage/issue9569 
Optimize file_tree ext_pillar and update file.managed to allow for binary contents
 2016-01-12 13:09:19 -07:00
Mike Place
2121be88e7 Merge pull request #30225 from slav0nic/patch-2 
fix salt-ssh debug doc
 2016-01-12 12:45:28 -07:00
Mike Place
7908086044 Merge pull request #30228 from dmacvicar/dmacvicar_document_schedule_once 
Document schedule `once` option
 2016-01-12 12:42:57 -07:00
Mike Place
1f5c1093fc Merge pull request #30235 from sjorge/state-zfs 
salt.states.zfs
 2016-01-12 12:39:13 -07:00
Mike Place
48d2bd9e78 Merge pull request #30303 from jacobhammons/pcre-match 
Changed notes to indicate that functions are matched using regular ex…
 2016-01-12 12:15:16 -07:00
Jacob Hammons
e5079ab4c9 Changed notes to indicate that functions are matched using regular expressions instead of minions 2016-01-12 11:55:36 -07:00
Erik Johnson
724b2f36ce Add file_tree/file.managed/contents_pillar example to FAQ 2016-01-11 16:45:56 -06:00
Erik Johnson
854c7d9978 Remove old FAQ item referencing gitfs bug in 0.16.x 
This release has been EOL for a long time, and is not even available
from pretty much any distro. It is safe to remove this item.
 2016-01-11 16:45:56 -06:00
Justin Findlay
22c1129f02 modules.state.sls,highstate: mock versionadded 2016-01-11 14:29:00 -07:00
Justin Findlay
934de30939 add state mock to 2015.8.4 release notes 2016-01-11 14:24:51 -07:00
Justin Findlay
741f7aba31 add 2015.5.9 release notes 2016-01-08 16:08:03 -07:00
Jacob Hammons
2431c4c5c3 Updated man page and doc conf.py copyright year to 2016 2016-01-08 11:08:59 -07:00
Jacob Hammons
fe3da1c174 Updated man pages and doc version for 2015.5.9 2016-01-08 11:05:46 -07:00
Jorge Schrauwen
087e8f8475 Generate docs for salt.states.zfs 2016-01-08 17:24:44 +00:00
Duncan Mac-Vicar P
e7bbcb7988 Document schedule once option 
closes #23742
 2016-01-08 11:35:44 +01:00
Sergey Maranchuk
4cce4a7c32 fix salt-ssh debug doc 
SALT_ARGV visible only in trace mode
 2016-01-08 11:33:39 +02:00
Colton Myers
17b919e9ec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/eauth/access_control.rst
    salt/modules/state.py
    salt/state.py
    salt/states/boto_secgroup.py
    tests/unit/modules/state_test.py
 2016-01-07 16:36:40 -07:00
Jacob Hammons
44ce704206 Updated zmq_monitor docs 2016-01-07 14:26:33 -07:00
Jacob Hammons
0d2111d397 Assorted doc bug fixes 
Refs #4381
Refs #8146
Refs #13036
Refs #6853
Refs #9319
Refs #13777
Refs #2229
Refs #14946
Refs #15042
 2016-01-07 14:08:30 -07:00
jacobhammons
5632ccb796 Merge pull request #30190 from jacobhammons/banners 
Updated doc site banners
 2016-01-06 15:37:33 -07:00
Jacob Hammons
51d28004da Updated doc site banners 2016-01-06 15:19:21 -07:00
Jacob Hammons
c3390955b0 Updated doc site banners 2016-01-06 15:18:11 -07:00
Jacob Hammons
266023baf1 Updated doc site banners 2016-01-06 15:16:26 -07:00
Colton Myers
f476c75fad Merge pull request #30062 from seanjnkns/develop 
Remove recurse_list from pillar_source_merging_strategy and add pilla…
 2016-01-06 10:27:35 -07:00
Sean Jenkins
8fc656b6f2 Set (pillar_)merge_lists to default for PR#30062 2016-01-06 09:55:20 -07:00
Colton Myers
7f8e666b8c Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/states/user.py
 2016-01-06 09:30:28 -07:00
Colton Myers
8bc5506c08 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/installation/rhel.rst
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/win_update.py
    salt/states/boto_elb.py
    salt/states/file.py
 2016-01-05 16:19:32 -07:00
Colton Myers
d73a7d6c4d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/ssh/index.rst
 2016-01-05 16:11:20 -07:00
Stanislav Blokhin
d81f6f7206 Fix typo in gpgkey URL 
Fixes following error on yum update:

Retrieving key from
https://repo.saltstack.com/yum/redhat/6/x86_64/latest/$releaseverSALTSTACK-GPG-KEY.pub

GPG key retrieval failed: [Errno 14] PYCURL ERROR 22 - "The requested
URL returned error: 404 Not Found"
 2016-01-04 16:43:19 +01:00
Jered Sutton
01dbf385ef Adding random_master to reference and updating master_shuffle. 
Adding master_shuffle to the minion example config file as it is needed for multi-master PKI.
 2016-01-02 23:49:08 -06:00
Mike Place
040412b0b1 Merge pull request #30093 from zmalone/pillar-notes 
Noting that file_roots and "state tree" should both be avoided
 2015-12-30 15:40:05 -07:00
Zach Malone
cfbfd58afe Noting that file_roots and "state tree" should both be avoided, because in some 
environments, the actual states show up another level down.  Adding notes about why this is undesirable.
 2015-12-30 13:10:46 -07:00
Mike Place
8c29e2dd6a Document that gitfs needs recent libs 
Closes #29921
 2015-12-30 12:00:33 -07:00
Sean Jenkins
fb6e895bf0 Merge remote-tracking branch 'upstream/develop' into develop 2015-12-30 09:43:05 -07:00
Sean Jenkins
1d7ee7bed2 Merge remote-tracking branch 'origin/develop' into sean 2015-12-30 08:44:30 -07:00
Andrew Colin Kissa
61ca281519 fix inline documentation examples not rendering 
add missing modules to indexes
 2015-12-30 07:35:57 +02:00
rallytime
c386d70742 Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/modules/alternatives.py
  - salt/modules/boto_rds.py
  - salt/modules/mount.py
  - salt/states/boto_iam.py
 2015-12-29 15:51:12 -07:00
Mike Place
60431e342a Add documentation on debugging salt-ssh 
Closes #27835
 2015-12-29 15:22:03 -07:00
rallytime
6176f383e5 Spelling fixes 2015-12-29 11:57:18 -07:00
rallytime
83c05729d6 Add Syndic documentation to miscellaneous Salt Cloud config options 
Fixes #30045
 2015-12-29 11:53:49 -07:00
Sean Jenkins
41353b7ab3 Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead 2015-12-29 10:22:54 -07:00
Mike Place
e915f4b591 Merge pull request #30053 from akissa/add-postgres-privileges-support 
Add postgres privileges support
 2015-12-29 09:50:44 -07:00
Andrew Colin Kissa
8066a06191 add postgres_language state module documentation 2015-12-29 13:13:37 +02:00
Andrew Colin Kissa
d27f0cc88a add postgres_privileges ref docs 2015-12-29 13:02:56 +02:00
Jacob Hammons
a04cebd48c Remove internal APIs from rest_cherrypy docs. 
Refs #28540
 2015-12-28 15:26:16 -07:00
Jacob Hammons
32a352120a updated spm docs 2015-12-28 14:29:02 -07:00
Mike Place
9e385369b7 Merge pull request #30034 from rallytime/bp-29893 
Back-port #29893 to 2015.8
 2015-12-28 13:20:51 -07:00
Mike Place
d8e1663ef1 Merge pull request #30031 from deuscapturus/patch-6 
Update index.rst
 2015-12-28 12:39:17 -07:00
Aditya Kulkarni
2fcf1590b8 Add info about VolumeType 2015-12-28 12:27:45 -07:00
rallytime
a257249789 Add versionadded to SSH Port docs 2015-12-28 12:24:04 -07:00
abednarik
0bb83e51aa Updated Cloud msic section. 
Added ssh_port section.
 2015-12-28 12:11:16 -07:00
Nicole Thomas
548d887510 Merge pull request #30003 from marnovdm/develop 
Adds thin provisioning support for new hard disks in VMware driver
 2015-12-28 12:08:38 -07:00
Marno van der Molen
35bd10c5ba Implement suggestions from rallytime, tries to adhere to same documentation style and fixes optional thin_provision configuration 2015-12-28 19:28:07 +01:00
Theodore Cowan
aa80bd2700 Update index.rst 
Inform user that state module runs will return "Failed to authenticate!" when the timeout is reached.  This should be fixed btw.
 2015-12-28 10:47:40 -07:00
Thomas S Hatch
46471d83a7 Merge pull request #29999 from alprs/feature-require_without_state_type 
[WIP] requisites without explicitly providing the state module
 2015-12-28 10:30:10 -07:00
Marno
72a5f6b554 Update documentation for vmware driver 2015-12-24 18:48:19 +01:00
Andreas Lutro
03ceaf103b add documentation about omitting state modules in requisites 2015-12-24 13:07:44 +01:00
Seth House
7cc7a97b91 Clarified render step from worker pool step 2015-12-23 13:48:55 -07:00
Jonathan Ballet
e6e36372a4 doc: fix documentation link for salt.serializers 2015-12-23 10:13:16 +01:00
Seth House
75a95f5154 Add to Reactor docs to illustrate the end-goal and use with Orchestrate 2015-12-22 15:17:44 -07:00
Seth House
028f000743 Update opening Reactor paragraph for conciseness 
We're far removed from 0.11 now so the extra exposition is just noise.
 2015-12-22 13:38:33 -07:00
Jorge Schrauwen
1294a1fa5c probably a good idea to actually add salt.states.zpool 2015-12-22 19:16:18 +00:00
Jorge Schrauwen
da80dea902 try to get state.states.smartos docs go be generated 2015-12-22 19:11:46 +00:00
Jorge Schrauwen
f5333ee2f8 salt.modules.fmadm still does not have docs generated, trying again 2015-12-22 19:08:22 +00:00
Mike Place
c19782a184 Merge pull request #29853 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-12-22 08:05:49 -07:00
B M Corser
b89e9c6476 Presumably what was meant 
Otherwise it's invalid syntax
 2015-12-21 21:17:23 +00:00
Aditya Kulkarni
61a9293af9 Add info about VolumeType 2015-12-21 11:26:53 -05:00
Jonathan Ballet
5aa0e9b1e0 Fix documentation typo for pillars 2015-12-21 13:26:02 +01:00
Jonathan Ballet
f2b41d04d7 Fix rendering issues for Cherrypy netapi documentation. 2015-12-21 13:26:02 +01:00
Jonathan Ballet
6922da46dc doc: fix warnings + some rendering issues 2015-12-21 13:26:02 +01:00
abednarik
b7e7bf5a29 Updated Cloud msic section. 
Added ssh_port section.
 2015-12-20 10:42:58 -03:00
Colton Myers
95fe811724 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/scripts.py
    salt/states/file.py
    salt/states/git.py
    salt/utils/event.py
 2015-12-18 15:00:24 -07:00
Mike Place
7eefaac58a Merge pull request #29814 from basepi/multi-master.windows.29396 
[2015.8][Windows] Fix multi-master on windows
 2015-12-18 10:16:52 -07:00
Mike Place
fb4eb28645 Merge pull request #29819 from rallytime/esxi-docs 
Add esxi module and state to docs build
 2015-12-18 09:20:27 -07:00
Eric Mosher
0a765de370 Add infoblox documentation 
Closes #29780
 2015-12-17 23:01:55 -05:00
Thibault Cohen
d37064951d Add k8s modules and states documentation 2015-12-17 21:44:49 -05:00
rallytime
e7c5863468 Add esxi module and state to docs build 
Also fixed some minor doc errors
 2015-12-17 16:33:59 -07:00
Colton Myers
2405501d75 Add documentation for tcp ipc_mode and multi-master 2015-12-17 14:08:41 -07:00
Mike Place
4044f3bb93 Merge pull request #29803 from rallytime/vsphere-docs 
Add vSphere module to doc ref module tree
 2015-12-17 11:52:56 -07:00
Mike Place
5f2f128f64 Merge pull request #29804 from irtnog/fix-rhel-repo-config 
Fix a typo in the gpgkey URL
 2015-12-17 11:50:46 -07:00
rallytime
3b7f5540ec Add vSphere module to doc ref module tree 2015-12-17 10:54:28 -07:00
Mike Place
c4f226f31e Merge pull request #29773 from l2ol33rt/debian_install_docfix 
Append missing wget in debian installation guide
 2015-12-17 10:29:18 -07:00
Aditya Kulkarni
10bfcb8cb0 Add documentation about scopes (GCE) 2015-12-17 09:42:15 -07:00
Matthew X. Economou
f15a3648a4 Fix a typo in the gpgkey URL 2015-12-17 10:48:24 -05:00
Andrew Colin Kissa
b749b9faba Add Pillar SQLCipher module 
Fixes #29781
 2015-12-17 09:48:27 +02:00
Robert James Hernandez
64cb4b0540 Append missing wget in debian installation guide 2015-12-16 13:44:35 -08:00
Aditya Kulkarni
ae5fbe9046 Add documentation about scopes (GCE) 2015-12-16 15:21:51 -05:00
Mike Place
1f4810be0f Merge pull request #29729 from rallytime/fix-14634 
Further clarifications on "unless" and "onlyif" requisites.
 2015-12-16 07:45:06 -07:00
Simon A. Eugster
0ca82f27b8 Doc update on masterless mode: Move master config to minion config 2015-12-16 10:59:14 +01:00
rallytime
45b77fb288 Add note about shell truthiness vs python truthiness 2015-12-15 16:14:31 -07:00
rallytime
3bfb87c031 Spelling fixes 2015-12-15 15:45:19 -07:00
rallytime
15c466cc12 Further clarifications on "unless" and "onlyif" requisites. 
Fixes #14634

- "unless" is actually a NAND operator
- remove usage of "opposite of unless" as that is confusing
 2015-12-15 15:42:56 -07:00
rallytime
45080f3629 Add examples of using multiple matching levels to Pillar docs 
Fixes #29091
 2015-12-15 14:57:36 -07:00
jraby
296de21056 Document syslog facility format and default value 2015-12-15 14:56:13 -05:00
Mike Place
1c6e896edb Merge pull request #29655 from abednarik/disable_log_doc_update 
Added a note regarding logging configuration.
 2015-12-15 11:50:05 -07:00
Colton Myers
5ac96cc8ba Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/tls.py
    salt/states/git.py
    salt/transport/tcp.py
 2015-12-14 15:56:26 -07:00
Colton Myers
b51cba59c0 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-12-14 15:44:21 -07:00
abednarik
bdf1824bd8 Added a note regarding logging configuration. 
Simple example on how to turn off logging.
 2015-12-14 17:26:40 -03:00
Mike Place
fe0778dad5 Merge pull request #29644 from rallytime/esxi-fixes 
Fixed a couple more ESXi proxy minion bugs
 2015-12-14 11:36:28 -07:00
abednarik
221c11f7da Updated documentation for Salt Development. 
In order to install pip modules for salt development we need to make sure that python devel is installed.
Otherwise pip command will fail.
 2015-12-14 13:57:51 -03:00
rallytime
577d5487a3 Fixed a couple more ESXi proxy minion bugs 
- Don't log the salt.utils.vmware.esxcli command (shouldn't log password)
- Make sure we catch all ssh key changes possibilities in esxi state
- Provide a use-case example of why using a list of passwords for the host is a useful idea
 2015-12-11 16:16:25 -07:00
Mike Place
9f83ab9cfc Merge pull request #29611 from cachedout/lint_29350 
Lint 29350
 2015-12-10 16:05:10 -07:00
Colton Myers
0afa5b0d5d Add cmd_umask to roster docs 2015-12-10 14:51:43 -07:00
Colton Myers
48311d42f7 Merge pull request #29384 from Granjow/watchRequisites 
Add an example to the watch requisite.
 2015-12-10 12:12:50 -07:00
Simon A. Eugster
d32bcc7d97 Documentation: Prefer cmd.run + onchanges over cmd.wait. 
* Add information on how the watch requisite targetse other states
* Update examples in salt.states.cmd about cmd.run and cmd.wait
 2015-12-10 08:12:09 +01:00
Simon A. Eugster
39e6bd7cc5 Requisite Documentation: Explain how to target other states 2015-12-10 08:05:42 +01:00
rallytime
5a2bb260d3 Added ESXi Proxy Minion Tutorial 
Also added some more documentation to other ESXi-related files
and fixed some related doc errors.
 2015-12-09 18:00:20 -07:00
Akhter Ali
88a55475a4 Merge branch 'develop' of github.com:saltstack/salt into Typo_correction 2015-12-09 17:03:31 -05:00
Akhter Ali
abe16e0b9f Fixing typo 2015-12-09 16:48:14 -05:00
Joe Healy
b96d8ff1d9 Minor update to release notes for missing fix 
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2015-12-09 12:30:52 +01:00
Benjamin Drung
e72354aac4 Fix typo specfic -> specific 2015-12-09 12:19:39 +01:00
Benjamin Drung
5708355762 Fix typo comparsion -> comparison 2015-12-09 12:17:49 +01:00
Adrian Heine né Lang
b765bd46dc Update service manager info for Debian 
Debian Jessie switched to `systemd` as default init system.
 2015-12-09 08:49:02 +01:00
Colton Myers
7918736656 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/dracr.py
    salt/states/boto_vpc.py
    tests/unit/states/file_test.py
 2015-12-08 14:46:23 -07:00
Mike Place
9bc9ca78de Merge pull request #29496 from terminalmage/remove-repoquery 
Remove dependency on repoquery from yumpkg.py
 2015-12-08 14:28:08 -07:00
Mike Place
25d3a75d8c Merge pull request #29540 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-12-08 14:27:01 -07:00
Mike Place
3ae096b7ac Merge pull request #29499 from rallytime/esxi-proxy 
Initial commit of ESXi Proxy Minion
 2015-12-08 14:10:13 -07:00
Mike Place
f77c8e7baf Merge pull request #29527 from jfindlay/2015.5 
2015.5.7 notes: add note about not being released
 2015-12-08 14:08:26 -07:00
Aditya Kulkarni
b3fdce7b75 Add docs 2015-12-08 15:58:38 -05:00
Colton Myers
9673fd0937 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/ec2.py
    tests/unit/states/file_test.py
 2015-12-08 12:23:26 -07:00
Simon A. Eugster
eb04e54b38 Compiler Ordering Docs: Use double backticks for highlighting inline code 2015-12-08 19:02:57 +01:00
Mike Place
de7f3d5a59 Merge pull request #29504 from rallytime/fix-12072 
Document userdata_file option for EC2 driver
 2015-12-08 09:54:33 -07:00
Justin Findlay
917e6f850c 2015.8.2 notes: add note about not being released 2015-12-08 09:16:26 -07:00
Justin Findlay
1a8044f0c9 2015.5.7 notes: add note about not being released 2015-12-08 09:12:36 -07:00
rallytime
90b4823bc2 Switch volumes and del_*_on_destroy example ordering 
Refs #29101
 2015-12-07 19:30:23 -07:00
rallytime
8357c95dc2 Document userdata_file option for EC2 driver 
Fixes #12072
 2015-12-07 16:52:10 -07:00
Erik Johnson
2461552a06 Hide aliased function 2015-12-07 15:20:51 -06:00
abednarik
8e5c3e366a Added Documentation note in salt cloud. 
Added a Note for salt cloud settings since documentation shows those key in uppercase, but salt cloud expects thos in lowercase.
 2015-12-06 13:42:18 -03:00
Jacob Hammons
c2dc709bce Added CVE-2015-8034 to 2015.8.3 and 2015.5.8 release notes 2015-12-03 20:14:16 -07:00
Jacob Hammons
4f51a737f9 Added CVE 2015-8034 to 2015.5.8 release notes 2015-12-03 20:02:16 -07:00
jacobhammons
ab890b632a Merge pull request #29417 from jacobhammons/repo-install-updates 
Repo install updates
 2015-12-03 19:39:41 -07:00
Jacob Hammons
d58182c5fa updated repo path for RHEL installation 2015-12-03 19:36:12 -07:00