valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
85,291 Commits 24 Branches 182 Tags 341 MiB
bab9a49418
Commit Graph

7731 Commits

Author SHA1 Message Date
Nicole Thomas
a175c40c1d Merge pull request #42364 from twangboy/release_notes_2017.7.0 
Windows Package notes for 2017.7.0
 2017-07-18 13:24:45 -06:00
Nicole Thomas
3e39526009 Merge pull request #42358 from Ch3LL/doc-update-develop 
[develop] Update version numbers in doc config for 2017.7.0 release
 2017-07-18 13:23:46 -06:00
Nicole Thomas
f06a6f1796 Merge pull request #42360 from Ch3LL/doc-update-2016.11 
[2016.11] Update version numbers in doc config for 2017.7.0 release
 2017-07-18 13:23:29 -06:00
Nicole Thomas
4dfe50e558 Merge pull request #42361 from Ch3LL/doc-update-2017.7 
[2017.7] Update version numbers in doc config for 2017.7.0 release
 2017-07-18 13:23:22 -06:00
Nicole Thomas
587138d771 Merge pull request #42363 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-18 12:40:48 -06:00
Nicole Thomas
e0595b0a0f Merge pull request #42319 from rallytime/config-docs 
Add more documentation for config options that are missing from master/minion docs
 2017-07-18 12:02:31 -06:00
Nicole Thomas
ba799b2831 Merge pull request #42179 from rallytime/fix-42151 
Fix some documentation issues found in jinja filters doc topic
 2017-07-18 12:01:56 -06:00
Nathan Grennan
4985e68f61 Update index.rst 2017-07-18 10:38:17 -07:00
Mike Place
1b683f2fca Merge pull request #37003 from AndrewPashkin/gradual-pillar-loading 
Make possible to reference previous pillars from subsequent pillars, as they specified in the top file
 2017-07-18 12:13:56 -05:00
rallytime
ccf790a83f Update all references for moved functions to use "files" util 
- fopen
- flopen
- fpopen
- safe_rm
- is_empty
- is_fcntl_available
 2017-07-18 10:31:01 -06:00
twangboy
96517d1355 Add note about patched windows packages 2017-07-18 10:06:55 -06:00
rallytime
7aa31ff030 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/git.py
  - salt/modules/pillar.py
  - salt/states/saltmod.py
  - salt/states/user.py
  - tests/integration/states/handle_iorder.py
 2017-07-18 09:05:43 -06:00
rallytime
f59ecb7ffe Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/executors/sudo.py
 2017-07-18 08:57:55 -06:00
Ch3LL
0f48ee8a35 [develop] Update version numbers in doc config for 2017.7.0 release 2017-07-17 16:58:03 -04:00
Ch3LL
dc5bb301f7 [2017.7] Update version numbers in doc config for 2017.7.0 release 2017-07-17 16:56:56 -04:00
Ch3LL
b90b7a7506 [2016.11] Update version numbers in doc config for 2017.7.0 release 2017-07-17 16:54:46 -04:00
Ch3LL
dc85b5edbe [2016.3] Update version numbers in doc config for 2017.7.0 release 2017-07-17 16:50:54 -04:00
Nathan Grennan
0bfc1a2fb2 Document use of python methods in jinja 2017-07-17 12:24:41 -07:00
Mike Place
c84d6db548 Merge pull request #42186 from rallytime/fix-42166 
Use long_range function for IPv6Network hosts() function
 2017-07-17 13:39:35 -05:00
Mike Place
87361ca128 Merge pull request #42244 from alexbleotu/jinja_globals_gh 
Jinja raise function and globals decorator
 2017-07-17 13:16:36 -05:00
Mike Place
866a1febb4 Merge pull request #42264 from rallytime/fix-41116 
Update minion restart section in FAQ doc for windows
 2017-07-17 12:40:39 -05:00
Mike Place
e588f235e0 Merge pull request #42269 from rallytime/fix-41721 
Add some clarity to "multiple quotes" section of yaml docs
 2017-07-17 12:38:17 -05:00
Mike Place
8f1cb287cf Merge pull request #42126 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-17 12:07:18 -05:00
Mike Place
c7b3f6a09a Merge pull request #42302 from rallytime/cloud-utils-fire-event-deprecation 
Remove sock_dir deprecation warning from salt.utils.cloud.fire_event
 2017-07-17 09:35:58 -05:00
rallytime
b40f980632 Add more documentation for config options that are missing from master/minion docs 2017-07-14 17:26:02 -06:00
rallytime
c406046940 Add clarification to salt ssh docs about key auto-generation. 
Fixes #42267
 2017-07-14 11:57:58 -06:00
rallytime
ffd3fae2c9 Add this change to the Oxygen release notes 2017-07-13 16:46:36 -06:00
rallytime
ccd78ed791 Remove Oxygen deprecation warning in lxc execution module 2017-07-13 16:42:42 -06:00
Bo Maryniuk
e38d432f90 Fix docs 2017-07-13 10:11:32 +02:00
Bo Maryniuk
1e8a56eda5 Describe function tagging 2017-07-13 10:11:21 +02:00
Bo Maryniuk
1d7233224b Describe function batching 2017-07-13 10:11:13 +02:00
Bo Maryniuk
1391a05d5e Bugfix: syntax error in the example 2017-07-13 10:11:07 +02:00
rallytime
f2250d474a Add a note about using different styles of quotes. 2017-07-12 17:08:23 -06:00
Mike Place
cb030114ec Merge branch 'develop' into profitbricks_fixes 2017-07-12 16:33:50 -05:00
SaltyCharles
2ff1d814b2 fix typo 2017-07-12 12:26:53 -07:00
Andrew Pashkin
7d59f7a6c6 Make possible to reference pillars, that come before current pillar in the top file 2017-07-12 19:03:05 +03:00
Nicole Thomas
63718024fd Merge branch 'develop' into jinja_globals_gh 2017-07-12 10:02:42 -06:00
rallytime
bd638880e3 Add mono-spacing to salt-minion reference for consistency 2017-07-12 09:36:07 -06:00
Denys Havrysh
6bb8b8f98c Add missing doc for `utils_dirs` Minion config option 2017-07-12 11:08:34 +03:00
Denys Havrysh
f1bc58f6d5 Utils: add example of module import 2017-07-12 11:08:34 +03:00
Nicole Thomas
5f01dccf8f Merge pull request #42214 from gtmanfred/develop 
allow not verifying ssl winrm saltcloud
 2017-07-11 17:33:21 -06:00
rallytime
38d9b3d553 Add some clarity to "multiple quotes" section of yaml docs 
Fixes #41721
 2017-07-11 17:28:45 -06:00
rallytime
30d62f43da Update minion restart section in FAQ doc for windows 
Fixes #41116
 2017-07-11 16:24:29 -06:00
Thomas Dutrion
c31ded341c Remove duplicate instruction in Openstack Rackspace config example 2017-07-11 16:01:15 -06:00
Ethan Devenport
65e132f071 Provide better error message when datacenter is not found. 
Corrected property name in documentation.

Updated library version dependency.
 2017-07-11 17:40:05 +00:00
Alexandru Bleotu
346b1880e3 Merge branch 'develop' into jinja_globals_gh 2017-07-11 10:33:06 +01:00
shengis
e95316b145 Merge branch 'develop' into add_dns_for_azurearm 2017-07-10 23:01:52 +02:00
Aurélien FUSIL-DELAHAYE
340368fdac add custom dns support for azurearm provider 
- added option in documentation : dns_servers
 2017-07-10 13:35:08 +02:00
Thomas Dutrion
6144af034a
Remove duplicate instruction in Openstack Rackspace config example 2017-07-09 11:34:14 +02:00
rallytime
798d29276e Add note about "to_bytes" jinja filter issues when using yaml_jinja renderer 2017-07-07 15:14:06 -06:00
Daniel Wallace
ce6b05d237 add release note 2017-07-07 13:15:30 -06:00
Daniel Wallace
2dac634dd2 add document for winrm_verify_ssl 2017-07-07 13:15:30 -06:00
rallytime
8d960d463a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/grains/core.py
 2017-07-06 17:42:30 -06:00
rallytime
b8bcc0d599 Add note to various network_hosts docs about long_run for IPv6 networks 2017-07-06 17:36:18 -06:00
rallytime
1bbff572ab Fix some documentation issues found in jinja filters doc topic 
These doc issues were all found in issue #42151. This commit takes
care of all of the issues presented in #42151 except for the last
task.
 2017-07-06 11:46:23 -06:00
Arthur Lutz
686926daf7 Update aws.rst - add Debian default username 2017-07-06 11:08:06 -06:00
Nicole Thomas
df1ed8929d Merge pull request #42109 from arthurlogilab/patch-20 
[doc] Update aws.rst - add Debian default username
 2017-07-06 10:58:25 -06:00
Mike Place
b093d6fba1 Merge pull request #42085 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-07-06 11:21:49 -05:00
Nicole Thomas
678d4d4098 Merge pull request #42141 from rallytime/bp-42098 
Back-port #42098 to 2016.11
 2017-07-06 09:11:49 -06:00
Ch3LL
e1694af39c Update builds available for rc1 2017-07-05 17:06:06 -04:00
twangboy
bd80243233 Change repo_ng to repo-ng 2017-07-05 13:56:11 -06:00
Nicole Thomas
afc19048bd Merge pull request #42131 from gtmanfred/release 
Add stuff to release notes
 2017-07-05 13:33:14 -06:00
Daniel Wallace
e2b3160c96 fix up PR 2017-07-05 10:41:26 -06:00
Daniel Wallace
6fbde35d11 add note about roster_defaults 2017-07-05 10:23:07 -06:00
Daniel Wallace
ea5ae2e468 add release note about about extmod blacklist and whitelist 2017-07-05 10:23:07 -06:00
Daniel Wallace
db0ed458d8 Update salt-master first before updating salt-minion 
Fixes #42124
 2017-07-05 10:23:07 -06:00
rallytime
8b35b367b3 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/dockerng.py
 2017-07-05 09:14:30 -06:00
Alexandru Bleotu
23f963f946 Added Errors section to jinja doc 2017-07-04 16:10:52 +01:00
Arthur Lutz
b78f179b19 [doc] Update aws.rst : typo fix 2017-07-04 14:21:11 +02:00
Arthur Lutz
8fcfb67ff5 Update aws.rst - add Debian default username 2017-07-04 14:00:10 +02:00
Ch3LL
d4e7b91608 Update releasecanddiate doc with new 2017.7.0rc1 Release 2017-07-03 23:06:54 -04:00
rallytime
c2822e05ad Remove references in docs to pip install salt-cloud 
Instead, provide the option to use "-L" with the Bootstrap script.

Fixes #41885
 2017-07-03 14:47:36 -06:00
twangboy
5a5d70866a Change repo_ng to repo-ng 2017-07-03 14:15:35 -06:00
rallytime
4d96cc1068 Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-07-03 09:28:18 -06:00
coutotyler
7f04255529 Adding post_event function. Cleaning up doc. Adding index.rst and salt.modules.datadog_api.rst for Sphinx 2017-07-01 22:22:51 -07:00
Mike Place
ec378c73ff Merge pull request #42020 from terminalmage/toctree-fix 
Add the new docker state modules to the toctree
 2017-06-30 15:58:27 -05:00
rallytime
c98470e557 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-06-30 10:00:10 -06:00
rallytime
9227a1263d Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-06-30 10:00:01 -06:00
Ch3LL
1de5e008a0 Add initial 2016.11.7 Release Notes 2017-06-30 11:32:10 -04:00
rallytime
3b87dbca12 Add the 'provider' key to salt.cloud.CloudClient.create() 
Much like how the 'profile' key exists in this function, the
'provider' key must also exist for other salt-cloud functions
to work properly. Various salt-cloud functions rely on provider
being available (as it is always available when using cloud profiles),
and so it should be available when no profile is used as well.

Also adjusted some rst syntax in the cloud config file as well
as the documentation around the create() function. Passing in
kwargs as the docs originally suggested does not work.

Fixes #41971
 2017-06-29 14:38:09 -06:00
Seth House
18dfa9893c Re-add msgpack to mocked imports 2017-06-29 13:49:45 -06:00
Seth House
5592e6e5d4 Revert "Allow docs to be built under Python 3" 2017-06-29 13:32:09 -06:00
Erik Johnson
bfa9836336 Add the new docker state modules to the toctree 2017-06-29 12:31:58 -05:00
Mircea Ulinic
66fc85abf6 Out mod autodoc 2017-06-29 17:01:53 +00:00
Erik Johnson
9a50e7c1ca Merge remote-tracking branch 'upstream/2017.7' into merge-develop 2017-06-28 22:10:50 -05:00
Erik Johnson
f13ddeb394 Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7 
Conflicts:
- doc/_themes/saltstack2/layout.html
- salt/auth/__init__.py
- salt/utils/schedule.py
 2017-06-28 20:27:32 -05:00
David Boucha
bff050ad52 change out salt support link to SaltConf link 2017-06-28 14:54:01 -06:00
rallytime
e512a29f08 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/state.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - salt/version.py
  - tests/unit/config/test_config.py
  - tests/unit/modules/test_zypper.py
 2017-06-28 11:31:53 -06:00
rallytime
7d7be2d375 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/ref/configuration/master.rst
  - tests/integration/states/test_archive.py
  - tests/unit/transport/test_tcp.py
  - tests/unit/transport/test_zeromq.py
 2017-06-28 10:48:37 -06:00
Ch3LL
2516ae1349 [2016.3] Bump latest release version to 2016.11.6 2017-06-28 11:24:57 -04:00
Ch3LL
fe4f5711d5 [2016.11] Bump latest release version to 2016.11.6 2017-06-28 11:24:17 -04:00
Ch3LL
0f5d5667cf [develop] Bump latest release version to 2016.11.6 2017-06-28 11:23:07 -04:00
Mike Place
7aacddf6ef
Allow docs to be built under Python 3 2017-06-27 11:46:47 -06:00
Mike Place
ff67d47a2e Merge pull request #41516 from kstreee/fix-blocking-waiting-tcp-connection 
Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications.
 2017-06-26 09:41:38 -05:00
Bo Maryniuk
c2b5e50d50 Add missing doc info for pressrelease 2017-06-26 14:38:19 +02:00
garethgreenaway
bd3ed3a7c5 Merge branch 'develop' into patch-1 2017-06-22 12:00:30 -07:00
Mike Place
c89cd2a4bf Merge pull request #41890 from cachedout/locale_doc 
Locale doc
 2017-06-22 12:34:46 -05:00
Mike Place
fb008e6f84 Merge pull request #41144 from terminalmage/issue34775 
gitfs: Add two new options to affect saltenv mapping
 2017-06-22 12:05:49 -05:00
garethgreenaway
5709cbbde5 Merge branch 'develop' into patch-1 2017-06-22 09:34:39 -07:00
Mike Place
df5a112a9b Merge pull request #41904 from twangboy/docs_win_add_firewall 
Fix anchor to _linux-iptables
 2017-06-22 11:16:23 -05:00
twangboy
d49bfd02a4 Fix anchor to _linux-iptables 2017-06-22 09:46:29 -06:00
Mike Place
3bc07d2f7c
Line breaks 2017-06-22 09:24:55 -06:00
Arno Schuring
e9d381ae6b Merge branch 'develop' into execution-module-docs 2017-06-22 13:45:05 +02:00
Yagnik
2f32db6d7b Update documentation of beacons 
Update beacons documentation to let the user know that beacons can also be set in pillars like other configs.
 2017-06-22 10:10:42 +05:30
Mike Place
679040c04b
Locale doc 2017-06-21 16:06:59 -06:00
Ch3LL
4e1239d980 Add additional commits to 2016.11.6 release notes 2017-06-21 17:15:11 -04:00
Erik Johnson
1279f56c56 gitfs: Add two new options to affect saltenv mapping 
This adds 2 new config options:

- gitfs_disable_saltenv_mapping - This allows a user to disable the environment mapping logic and rely solely on per-saltenv configuration
- gitfs_ref_types - This allows individual ref types to be ignored

It also includes a performance improvement in retrieving tree objects
matching the desired ref name. Before, we would iterate through the
different refs and check if the name matched the desired ref's name.
Now we just check for a head/tag ref based on the ref path in the
gitdir (e.g. refs/remotes/origin/master or refs/tags/v1.2.3). This
prevents us from needlessly iterating through all refs until a match is
found, which does not scale well when the number of branches and tags is
larger.
 2017-06-21 12:42:48 -05:00
Erik Johnson
63823f3436 Do not merge master_tops and top file matches using set union 
The code which integrates master_tops SLS matches with top file SLS
matches was using set operations to ensure there were no duplicate
matches. However, the process of first converting the matches to a set,
and then performing a union on the two sets, has the side effect of
making the ordering unpredictable.

The set operations have been removed in favor of list comprehensions.
This ensures that the ordering is predictable, and that master_tops
matches are executed *after* top file matches.

In addition, a new minion config option called "master_tops_first" has
been added to allow for the master_tops matches to be executed *before*
top file matches.
 2017-06-20 15:04:34 -05:00
Mike Place
87a252fda7 Merge pull request #41852 from Ch3LL/rn_2017_py 
Update 2017 Release Notes with Python Messages
 2017-06-20 12:17:04 -05:00
Mike Place
f720a849ba Merge pull request #41795 from isbm/isbm-suse-upstream-leftovers 
Things, that didn't made to 2017.7 for some reasons
 2017-06-20 09:28:21 -05:00
Ch3LL
75f93edff2 Update 2017 Release Notes with Python Messages 2017-06-20 09:55:13 -04:00
Mike Place
a4195f5246 Merge pull request #41841 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-06-19 18:01:11 -05:00
rallytime
2cfabc467c Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/windows/req.txt
  - salt/modules/dockermod.py
 2017-06-19 14:17:01 -06:00
rallytime
add5b118a3 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/yumpkg.py
  - tests/unit/templates/test_jinja.py
 2017-06-19 14:12:36 -06:00
C. R. Oldham
16a05a5554 Fix backticks and dropped clause. 2017-06-19 14:03:34 -06:00
Mike Place
56e1d3bc10 Merge pull request #41827 from alexbleotu/jinja_tests-gh 
JINJA tests
 2017-06-19 14:59:46 -05:00
C. R. Oldham
a6025c3c66 Clarify some LDAP issues driven by #38259 and #38293 2017-06-19 12:46:28 -06:00
Alexandru Bleotu
e42d1172a8 Added Tests section in JINJA documentation 2017-06-19 17:15:23 +01:00
Bo Maryniuk
fe97520bc7 Merge branch '2017.7' into isbm-suse-upstream-leftovers 2017-06-19 15:21:13 +02:00
Mircea Ulinic
fae959d24b Remove duplicate mattermost ref 2017-06-19 09:52:54 +00:00
Mircea Ulinic
d8dc8a338b Add redis cache reference 2017-06-19 09:52:33 +00:00
Mircea Ulinic
fd28d3385c Adding Jinja cross ref 2017-06-19 09:49:45 +00:00
garethgreenaway
4c8aa25080 Merge pull request #41813 from rallytime/add_new_doc_modules 
Add new documentation file references to build system for 2017.7
 2017-06-16 18:54:15 -07:00
Nicole Thomas
c3a49c9552 Merge pull request #41805 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-06-16 16:01:06 -06:00
Nicole Thomas
4c9a73d75f Merge pull request #41728 from twangboy/win_install_docs 
Win install docs
 2017-06-16 15:41:21 -06:00
rallytime
ff277bc458 Add new documenation file references to build system for 2017.7 2017-06-16 21:17:33 +00:00
rallytime
4780e99ac2 Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-06-16 11:53:38 -06:00
rallytime
58262608cd Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/config/__init__.py
  - salt/master.py
  - salt/modules/zypper.py
  - tests/unit/modules/timezone_test.py
 2017-06-16 10:43:02 -06:00
Bo Maryniuk
e9de0746ae Fix grain for os_family on SUSE series 2017-06-16 14:39:08 +02:00
rallytime
c828ad803a Add a bunch of config options to the various master/minion files that are missing 
I started on these a while ago and never submitted them. I added a couple more today
and figured I should get these in.

Refs #32400
 2017-06-15 16:21:47 -06:00
Mike Place
9c45fa044d Merge pull request #41748 from terminalmage/issue3415 
Add comparison operator support for package installation in yum/dnf and apt
 2017-06-15 15:32:37 -05:00
Mike Place
a46f6809df Merge pull request #41758 from twangboy/docs_win_add_master_config 
Add Windows Master config information
 2017-06-15 15:29:27 -05:00
rallytime
7fef4cf38f Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
 2017-06-15 10:57:27 -06:00
twangboy
b6201bac33 Fix version numbers 2017-06-15 09:53:57 -06:00
twangboy
c3dc38587e Fix indentation 2017-06-15 09:49:13 -06:00
Mike Place
c58f3811ce Merge pull request #41746 from rallytime/version-added-nitrogen 
Update Nitrogen references to 2017.7.0
 2017-06-15 10:12:18 -05:00
Mike Place
b0556bd58b Merge branch 'develop' into issue3415 2017-06-15 10:09:46 -05:00
Mike Place
e685858269 Merge pull request #41750 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-06-14 17:15:40 -05:00
twangboy
80ac6381c2 Add Windows Master config information 2017-06-14 15:15:46 -06:00
Ch3LL
fa368f21ac
Add Change Log to 2016.11.6 Release Notes 2017-06-14 16:00:50 -04:00
rallytime
d7ecd3c149 Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-06-14 13:35:50 -06:00
rallytime
89834e49c2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - conf/master
  - salt/utils/schedule.py
 2017-06-14 13:24:11 -06:00
Erik Johnson
f1d7eb4166 Add comparison operator feature to Oxygen release notes 2017-06-14 13:47:49 -05:00
twangboy
795a1aab4f Add instructions for Windows Firewall 2017-06-14 11:42:00 -06:00
rallytime
c5b75d030a Update Nitrogen references to 2017.7.0 in doc/* 2017-06-14 11:36:06 -06:00
twangboy
45975e299e Remove reference to Salt Enterprise 2017-06-14 09:39:29 -06:00
Mike Place
4b43ba3366 Merge pull request #41585 from cro/sign_minion_messages 
Sign_minion_messages support
 2017-06-13 16:14:40 -05:00
twangboy
22601201c4 Add note about salt-master on Windows 2017-06-13 15:09:38 -06:00
twangboy
d67c1dfbf7 Remove references to salt master installation 2017-06-13 15:02:44 -06:00
rallytime
74d9a36d5a Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - pkg/salt-proxy@.service
  - salt/modules/npm.py
  - salt/modules/parted.py
  - tests/integration/modules/test_libcloud_dns.py
 2017-06-13 15:01:51 -06:00
rallytime
bdf33d7f5f Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-06-13 09:26:05 -06:00
rallytime
5150916556 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/parted.py
 2017-06-12 20:10:45 -06:00
Erik Johnson
6ec9dfb7f3 Update version in master-tops docs 
This paragraphs is referring to #37322, which was pushed to Oxygen.
 2017-06-12 17:20:09 -05:00
rallytime
c91ca5f809 Remove note about version incompatibility with salt-cloud 
The note references very old versions of salt + salt-cloud and since
salt-cloud has been incorporated into salt for quite some time, this
notice is no longer needed.
 2017-06-12 11:16:52 -06:00
Adam Mendlik
30ab6809e6 Create unique page tag for kernelpkg documentation 2017-06-09 13:06:55 -06:00
Adam Mendlik
ebd9a8e759 Add documentation for kernelpkg state module 2017-06-09 11:55:52 -06:00
Adam Mendlik
2fbfa5d177 Add documentation for kernelpkg execution modules 2017-06-09 11:55:52 -06:00
C. R. Oldham
dadf4b851c Add documentation to the example master and minion configuration files. 
Move minion event signing to a saner place.
Enable dropping messages when signature does not verify or when
minion is not adding the signature to its payloads.
 2017-06-08 13:18:53 -06:00
Vasili Syrakis
4fbcc3b318 Added documentation for the annotation 2017-06-09 00:25:10 +10:00
Arno schuring
503a7c7c4d
Fix typo in modules doc 2017-06-08 13:47:40 +02:00
Arno schuring
bd1599e9f6
Add __init__ to modules doc 
Add a description for the module __init__() function, as suggested
in #41628
 2017-06-08 13:46:32 +02:00
Arno schuring
85f520467a
Update modules doc 
Reword the description of the __virtual__() function, to clarify why
__salt__ should not be relied upon. In response to #41628
 2017-06-08 13:45:14 +02:00
Mike Place
b7fcf9c0da Merge pull request #41636 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-06-07 12:42:04 -05:00
rallytime
396b06fdf8 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-06-07 09:54:20 -06:00
rajvidhimar
0fd3344a65 Update network_automation doc 2017-06-07 14:04:58 +05:30
Mike Place
94aa1876d4 Merge pull request #41546 from cloudflare/dns-grains 
Add host_dns grain for napalm
 2017-06-06 15:00:07 -05:00
Mircea Ulinic
564f2d1e3d Indent correctly the code block 2017-06-06 15:23:14 +00:00
Mircea Ulinic
b70df6e576 Reference new Jinja filters in the release notes 2017-06-06 15:15:06 +00:00
Mircea Ulinic
406e582479 Small adjustment 2017-06-06 15:14:47 +00:00
Mircea Ulinic
62cb2a1c7a More jinja references 2017-06-06 15:05:50 +00:00
Mircea Ulinic
bba8c27873 Restructure the Jinja topic to have refrences 2017-06-06 14:56:21 +00:00
Mircea Ulinic
2a8c5cef04 Add notes regarding other new features 2017-06-06 14:18:01 +00:00
Mircea Ulinic
b59760fae2 Fix indentation for better display 2017-06-06 13:52:01 +00:00
Mircea Ulinic
ad4e6e5ec5 salt.beacons.log instead of 'Log' 2017-06-06 13:46:38 +00:00
Mircea Ulinic
36985bb1ed Remove service state, not a new one 2017-06-06 13:45:02 +00:00
Mircea Ulinic
b6b6a51846 Index new modules introduced in Nitrogen 2017-06-06 13:41:32 +00:00
Mircea Ulinic
6b1b05129c Remove the reference to the profile outputter 2017-06-06 12:49:04 +00:00
rajvidhimar
e92b110a1c Junos specific documentation for topic Network Automation 2017-06-05 16:03:30 +05:30
Ric Klaren
aa88749a71 Add flag to disable validation when cloning a libvirt domain 
Provide workaround for issue #41137
 2017-06-01 23:14:15 +02:00
Mircea Ulinic
fb12353a1d Insert note in the Nitrogen release 2017-06-01 11:42:53 +00:00
kstreee
94b9ea51eb Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications. 2017-05-31 18:28:18 +09:00
Mike Place
26c3441c57 Merge branch 'develop' into merge-develop 2017-05-30 12:56:25 -05:00
Mike Place
21a1b41a42 Merge pull request #41502 from whiteinge/epub-tocdup 
Add epub_tocdup to conf file
 2017-05-30 12:44:19 -05:00
rallytime
8c1dc36a8b Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/modules/zypper.py
  - salt/utils/parsers.py
 2017-05-30 10:20:44 -06:00
Seth House
ebefecea33 Add epub_tocdup to conf file 
http://www.sphinx-doc.org/en/stable/config.html#confval-epub_tocdup
 2017-05-30 10:17:52 -06:00
Mike Place
7cd029c9ed Merge pull request #41142 from FedericoCeratto/mysql_cache 
Implement MySQL-based minion data cache
 2017-05-30 10:59:32 -05:00
Federico Ceratto
57b91feb25 Implement etcd based minion data cache 2017-05-29 10:51:10 +01:00
Mike Place
cec5af7ce3 Merge pull request #41437 from Ch3LL/fix_gce_net 
Remove ex_subnetwork requirement for GCE
 2017-05-26 17:04:06 -05:00
rallytime
ff417db115 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - doc/topics/venafi/index.rst
  - pkg/salt-proxy@.service
  - salt/config/__init__.py
 2017-05-26 11:27:24 -06:00
rallytime
de85b49b90 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/cp.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/gzip_util.py
  - tests/integration/shell/test_cp.py
 2017-05-26 11:11:54 -06:00
Nicole Thomas
5bb9dac9ec Merge pull request #41413 from gtmanfred/nitrogen 
Write tests for Venafi runner
 2017-05-26 10:09:23 -06:00
Nicole Thomas
824f2d3b69 Merge pull request #41398 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-26 09:17:48 -06:00
Ch3LL
3f94964801
Remove ex_subnetwork requirement for GCE 2017-05-25 16:25:12 -04:00
Nicole Thomas
8188ecf12b Merge pull request #41354 from tsaridas/minion_id_lowercase 
minion_id_lowercase
 2017-05-25 12:45:59 -06:00
Daniel Wallace
6dfb63f15d add venafi to table of contents 2017-05-25 10:27:40 -06:00
Daniel Wallace
343a0b206c fix doc 2017-05-25 10:26:54 -06:00
wgoulet
44dec966c8 Updated documentation for Venafi module with better examples & clarifications 2017-05-25 10:26:54 -06:00
Federico Ceratto
412070b841 Implement MySQL-based minion data cache 2017-05-25 11:29:02 +01:00
David Boucha
5eb27571a0 Correct doc to actually blacklist a module 2017-05-24 17:22:36 -06:00
rallytime
9ff2694155 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - pkg/salt-minion.service
  - salt/modules/junos.py
  - salt/modules/localemod.py
  - salt/modules/win_system.py
  - salt/states/junos.py
  - tests/unit/modules/test_localemod.py
  - tests/unit/modules/test_win_powercfg.py
  - tests/unit/states/dockerng_test.py
 2017-05-24 16:32:59 -06:00