Commit Graph

5455 Commits

Author SHA1 Message Date
Andrew Colin Kissa
806823315e Add postgres_initdb state module documentation 2016-01-22 12:21:03 +02: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
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
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