valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
88,227 Commits 24 Branches 182 Tags 341 MiB
59dc7cd96f
Commit Graph

2438 Commits

Author SHA1 Message Date
rallytime
4a86f23bf1 Move state-related utils to salt.utils.state.py 
Moves the following functions from `salt.utils` to `salt.utils.state`:
- gen_state_tag
- search_onfail_requisites
- check_onfail_requisites
- check_state_result

Original functions have a deprecation warning added and all references
in Salt code were updated to use the new function path, including moving
some unit tests.
 2017-09-01 16:09:59 -04:00
Nicole Thomas
bab9a49418 Merge branch 'develop' into ext_pillar_config_param-gh 2017-08-30 17:44:41 -04:00
rallytime
26410c662f Update some salt.utils.x paths for moved util functions 
Through merge forwards, some of the old-style paths have made their
way into develop. This PR corrects some of these instances on the more
popular functions.
 2017-08-29 16:24:47 -04:00
Nathan Fish
0844f8b47b nfs_export: fix docstring syntax and add to index 2017-08-28 13:01:34 -05:00
Alexandru Bleotu
27e5059f04 Small fixes to documentation 2017-08-25 06:41:29 -04:00
Alexandru Bleotu
31d74f1a67 Add 'pass_to_ext_pillars' minion config option documentation 2017-08-25 06:41:22 -04:00
rallytime
3d0d9110ac Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/pillar/git_pillar.py
  - salt/utils/files.py
  - salt/utils/process.py
  - tests/unit/utils/test_which.py
 2017-08-24 15:33:15 -04:00
rallytime
5901b10c14 Remove deprecated Legacy Git Pillar code 2017-08-23 16:49:58 -04:00
Mike Place
ae5d3ffe99 Merge pull request #43013 from amendlik/kernelpkg-remove 
Add kernelpkg functions to remove kernel packages
 2017-08-23 11:47:58 -06:00
rallytime
bcbe180fbc Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-08-23 10:08:09 -04:00
Nicole Thomas
7c78a02df4 Merge branch 'develop' into issue36942 2017-08-23 09:38:12 -04:00
Denys Havrysh
330d989b46 Import util modules on Master like it works on Minion 2017-08-23 11:28:02 +03:00
Mike Place
7c68c93e93 Merge pull request #42720 from kunal-bajpai/modularise-tokens 
Modularise eauth token storage and authentication
 2017-08-22 14:10:45 -06:00
Daniel Wallace
ea9e6dfd73 Merge branch 'develop' into modularise-tokens 2017-08-22 08:49:55 -06:00
rallytime
67cdfd28ad Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cli/cp.py
  - salt/modules/testinframod.py
  - salt/states/jenkins.py
  - tests/unit/utils/test_find.py
 2017-08-22 09:07:26 -04:00
Denys Havrysh
af743ff6c3 [DOCS] Add missing utils sub-dir listed for extension_modules 2017-08-22 12:18:42 +03:00
Kunal Bajpai
49a2d6d950 Add runner to sync eauth_token modules, fix masterapi daemon to use token module 2017-08-22 12:31:00 +05:30
rallytime
84829a6f8c Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/jenkins.py
  - salt/states/jenkins.py
 2017-08-18 09:13:54 -04:00
Corvin Mcpherson
78fd3f9b4d Merge branch 'develop' into issue36942 2017-08-17 16:18:46 -04:00
garethgreenaway
51d16840bb Merge pull request #42890 from DSRCorporation/bugs/42627_salt-cp 
Make chunked mode in salt-cp optional
 2017-08-17 11:37:43 -07:00
Adam Mendlik
898d69b1e1 Update kernelpkg documentation 2017-08-17 11:27:57 -06:00
Dmitry Kuzmenko
cfddbf1c75 Apply code review: update the doc 2017-08-17 16:47:45 +03:00
aajdinov
d365888489 Initial commit of oneandone salt cloud driver. 2017-08-17 08:03:01 +00:00
Nicole Thomas
de809a934a Merge pull request #42576 from lyft/allow-returning-false-in-test-mode 
Document returning False in test=True mode
 2017-08-15 17:42:44 -04:00
garethgreenaway
c220372965 Merge branch 'develop' into datadog-events_api 2017-08-15 09:02:04 -07:00
Nicole Thomas
d8b7afbbd1 Merge pull request #42928 from UtahDave/remove_stormpath2 
Remove stormpath2
 2017-08-15 10:09:23 -04:00
Corvin Mcpherson
23e1b23925 Change jinja line statement and line comment prefix default to '' instead of None 2017-08-15 02:13:43 -04:00
Corvin Mcpherson
eb713c699f Add jinja line statement and line comment options to master config. 2017-08-14 19:56:34 -04:00
David Boucha
0ceb8009c7 remove Stormpath module, states and docs 2017-08-14 16:03:00 -06:00
rallytime
78e744bda4 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/client/mixins.py
  - salt/fileclient.py
  - salt/modules/status.py
  - tests/integration/states/test_npm.py
 2017-08-14 14:21:17 -04:00
Dmitry Kuzmenko
afedd3b654 Typos and version fixes in the doc. 2017-08-14 18:08:40 +03:00
Dmitry Kuzmenko
999388680c Make chunked mode in salt-cp optional (disabled by default). 
This reverts breaking of backward compatibility related to the cp.recv
interface change.
 2017-08-11 22:44:42 +03:00
rallytime
29ff19c587 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/config/__init__.py
  - salt/states/dockerng.py
  - salt/utils/cloud.py
 2017-08-11 15:17:19 -04:00
Nicole Thomas
f43c141753 Merge branch 'develop' into datadog-events_api 2017-08-11 12:02:23 -04:00
Robert James Hernandez
744bf954ff Adding missing output flags to salt cli 2017-08-10 13:19:08 -07:00
rallytime
5d8d6225b5 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/augeas_cfg.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/runners/manage.py
  - salt/states/boto_cfn.py
  - salt/utils/cloud.py
  - tests/integration/states/test_pkg.py
 2017-08-10 14:47:14 -04:00
Petr Michalec
87a11541e1 Merge branch 'develop' into pr/jinja_line_statements 2017-08-10 18:27:51 +02:00
rallytime
152eb88d9f Update modules --> states in kubernetes doc module 
The kubernetes state docs are not rendering/building due to a typo
in the doc module.

Fixes #42639
 2017-08-08 14:42:34 -04:00
Erik Johnson
3184168365 Use explicit unicode strings + break up salt.utils 
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.

A summary of the changes in this PR is as follows:

* Moves the following functions from `salt.utils` to new locations
  (including a deprecation warning if invoked from `salt.utils`):
  `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
  `dequote`, `is_hex`, `is_bin_str`, `rand_string`,
  `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
  `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
  `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
  `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
  `is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
  `salt/utils/__init__.py` for better organization, so we can keep the
  deprecated ones separate from the ones yet to be deprecated as we
  continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
  unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
  import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
  accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
  such that it returns a string matching the passed size. Previously
  this function would get `size` bytes from `os.urandom()`,
  base64-encode it, and return the result, which would in most cases not
  be equal to the passed size.
 2017-08-08 13:33:43 -05:00
rallytime
f20f3742cb Merge branch '2017.7' into 'develop' 
Conflicts:
  - tests/unit/test_crypt.py
 2017-08-07 10:43:06 -04:00
Daniel Wallace
4bbfc751ae render kubernetes docs 2017-08-03 09:01:34 -06:00
Mike Place
fb81e78f71 Merge pull request #42603 from twangboy/win_fix_runas 
Add runas_passwd as a global for states
 2017-07-31 14:49:48 -05:00
twangboy
464ec34713 Fix another instance of runas_passwd 2017-07-28 11:20:48 -06:00
twangboy
4ea264e3db Change to runas_password in docs 2017-07-28 10:16:38 -06:00
Nicole Thomas
1087a0a899 Merge pull request #42384 from letsmakesense/patch-1 
state_top value also affects pillar top file
 2017-07-28 09:50:54 -06:00
garethgreenaway
b08627949a Merge branch 'develop' into datadog-events_api 2017-07-27 16:39:46 -07:00
twangboy
b9c91eba60 Add runas_passwd as a global for states 2017-07-27 15:46:58 -06:00
rallytime
36a1bcf8c5 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_wua.py
  - salt/utils/schedule.py
  - tests/unit/modules/rabbitmq_test.py
 2017-07-27 14:00:15 -06:00
rallytime
1f0b90aa57 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/engines/slack.py
 2017-07-26 17:51:36 -06:00
Aneesh Agrawal
1f82f90fc9 Document returning False in test=True mode 
Currently, in test mode states always return None even on failure.
This masks failed states in highstate output,
which instead just look like they are going to make changes.

In some cases states can determine if they will fail even on a dry run,
e.g., if an API call to a service to determine the state of a
resource fails due to invalid credentials or a missing parameter.

In these cases, allow returning a result of False even in dry runs
to enable catching more errors at testing time.
 2017-07-26 22:00:16 +00:00
rallytime
685c2cced6 Add information about returning a tuple with an error message 2017-07-25 14:44:18 -06:00
rallytime
fa466519c4 Add a mention of the True/False returns with __virtual__() 
And their relationship to `__virtualname__`.

Fixes #42375
 2017-07-24 13:58:16 -06:00
rallytime
c673b64583 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/conf.py
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
  - salt/engines/hipchat.py
  - salt/engines/slack.py
  - salt/grains/core.py
  - salt/version.py
  - tests/integration/states/test_renderers.py
 2017-07-20 09:54:08 -06:00
letsmakesense
b234f80308 state_top value also affects pillar top file 
Hi,
thanks for making Saltstack. It's terrific. 
When I was looking for an option to change the name of the pillar top file I couldn't find anything, but I found out that 'state_top' also affects the name of pillar top file. My change tries to make this behaviour explicit.
Greetings,
Peter
 2017-07-19 11:29:18 +02: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
b40f980632 Add more documentation for config options that are missing from master/minion docs 2017-07-14 17:26:02 -06:00
Petr Michalec
0373f90e86 Merge branch 'develop' into pr/jinja_line_statements 2017-07-14 15:03:00 +02:00
Petr Michalec
c770ba3287
Extend Jinja options support (line statements) 2017-07-14 14:44:11 +02:00
Denys Havrysh
6bb8b8f98c Add missing doc for `utils_dirs` Minion config option 2017-07-12 11:08:34 +03:00
rallytime
8d960d463a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/grains/core.py
 2017-07-06 17:42:30 -06:00
Daniel Wallace
ea5ae2e468 add release note about about extmod blacklist and whitelist 2017-07-05 10:23:07 -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
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
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
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
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
Arno Schuring
e9d381ae6b Merge branch 'develop' into execution-module-docs 2017-06-22 13:45:05 +02: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
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
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
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
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
c3dc38587e Fix indentation 2017-06-15 09:49:13 -06:00
twangboy
80ac6381c2 Add Windows Master config information 2017-06-14 15:15:46 -06:00
rallytime
c5b75d030a Update Nitrogen references to 2017.7.0 in doc/* 2017-06-14 11:36:06 -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
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
kstreee
94b9ea51eb Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications. 2017-05-31 18:28:18 +09: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
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
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
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
Nicole Thomas
8188ecf12b Merge pull request #41354 from tsaridas/minion_id_lowercase 
minion_id_lowercase
 2017-05-25 12:45:59 -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
Andreas Tsaridas
38acbb2480 add dashes 2017-05-24 18:16:54 +02:00
rallytime
d2d9a3d29f Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/cli/salt-cp.rst
  - salt/config/__init__.py
 2017-05-23 15:58:14 -06:00
rallytime
2ba9f644f6 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-20 17:08:39 -06:00
Andreas Tsaridas
e7d183b8a5 - minion_id_lowercase 2017-05-20 15:10:25 +02:00
Mike Place
8386d10b4b Merge pull request #41192 from DSRCorporation/features/executors_redesign_doc 
Executors redesign and documentation
 2017-05-18 10:42:20 -05:00
Mike Place
051259d469 Merge pull request #41218 from gtmanfred/roster 
allow for syncing salt-ssh rosters on the master
 2017-05-17 14:21:25 -05:00
rallytime
2690a36cb8 Remove doc ref files for search runner 
The search runner and related code was removed in #41245
 2017-05-15 16:48:21 -06:00
Dmitry Kuzmenko
7a8b644da7 Executors documentation. 2017-05-15 11:41:00 +03:00
Seth House
f1dc63f16c Add performance expectations and recommendations to rest_cherrypy docs 2017-05-12 17:57:32 -06:00
Erik Johnson
10dc695cc4 Make salt-cp work with larger files 
This breaks the files into chunks to keep them from exceeding the max size
of a published command. It also adds recursion, allowing for entire
directories to be transmitted. Finally, it adds gzip compression, and
a "-n" flag to disable use of compression.
 2017-05-12 15:13:28 -05:00
Daniel Wallace
836ee32ff6 allow for syncing salt-ssh rosters on the master 2017-05-12 13:36:46 -06:00
Seth House
e61b83c09e Move the local TOC up since it's such a large docstring 2017-05-12 12:03:26 -06:00
rallytime
d510583bb5 Remove blockdev execution module 
All of the functions in the blockdev execution module have been
moved over to the disk execution module. These functions were
slated for removal in the Oxygen release.
 2017-05-11 14:13:42 -06:00
rallytime
4100e2b6a6 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-10 15:32:33 -06:00
Nicole Thomas
ac5bda8839 Merge pull request #41117 from terminalmage/rename_env_blacklist_whitelist 
Rename the *_env_blacklist config opts to *_saltenv_blacklist
 2017-05-10 14:03:23 -06:00
rallytime
ef0df4a954 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_network.py
  - salt/modules/win_pkg.py
  - salt/utils/gitfs.py
  - tests/unit/modules/test_win_network.py
  - tests/unit/states/test_file.py
 2017-05-09 14:32:49 -06:00
rallytime
4c099df8fa Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-09 11:27:55 -06:00
Daniel Wallace
c038727a80 document clouds dynamic directory 2017-05-07 20:30:20 -06:00
Erik Johnson
59737a34a5 Rename the *_env_blacklist config opts to *_saltenv_blacklist 
These were overlooked a while back when we deprecated env in favor of
saltenv.
 2017-05-06 23:11:33 -05:00
Erik Johnson
8c6410e3cd Add notices about ssl_verify only working in 0.23.2 and newer 2017-05-05 17:04:23 -05:00
rallytime
01a012bbdf Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-05 10:12:18 -06:00
rallytime
319dc45c1d Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/runners/saltutil.py
 2017-05-04 11:51:32 -06:00
rallytime
c91bb18298 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/pip.py
  - salt/states/saltmod.py
 2017-05-04 11:49:33 -06:00
Nicole Thomas
2b47b7bec6 Merge pull request #41045 from terminalmage/clarify-gitfs-docs 
Clarify gitfs docs
 2017-05-03 16:24:54 -06:00
Erik Johnson
c757eda331 Clarify gitfs docs 
This improves cross links to the per-remote docs from the master config
file documentation.
 2017-05-03 13:34:56 -05:00
Mike Place
bd151ff49b Merge pull request #41004 from corywright/implement-file-auth 
Add salt.auth.file module for simple file based authentication
 2017-05-03 10:54:24 -06:00
rallytime
19a3ecd5b8 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-03 09:59:09 -06:00
rallytime
fc756c595c Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
 2017-05-02 12:52:59 -06:00
Mike Place
cc71347a7c Merge pull request #40973 from tonybaloney/libcloud_compute 
Introduce `libcloud_compute` execution module for Libcloud compute APIs
 2017-05-02 10:03:42 -06:00
Cory Wright
9e17ad28eb Add salt.auth.file module for simple file based authentication 2017-05-02 10:26:57 -04:00
Mike Place
42967eab99 Merge pull request #40893 from tonybaloney/libcloud_state 
Improvements to libcloud modules
 2017-05-01 13:58:25 -06:00
rallytime
a9fb83c28c Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-01 10:43:45 -06:00
Anthony Shaw
4fce227190
update the tutorials and docs 2017-04-30 20:32:44 +10:00
Anthony Shaw
e92a7ba660 Merge branch 'develop' into libcloud_state 2017-04-29 07:43:28 +10:00
rallytime
a69cd74f75 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/cloud/clouds/nova.py
  - salt/spm/__init__.py
 2017-04-28 09:23:42 -06:00
Mike Place
909d519ddb Merge pull request #40751 from rallytime/fix-39531 
Use Salt's SaltYamlSafeLoader and SafeOrderedDumper classes for yaml.load/dump
 2017-04-28 06:56:05 -06:00
rallytime
a876bcdb8a Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-27 10:37:05 -06:00
Cory Wright
2995a05c2b Make salt.auth.rest heading consistent with all other salt.auth documentation 2017-04-27 09:32:53 -04:00
Mike Place
7a63e3cfd2 Merge pull request #40668 from grep4linux/new_xen_cloud_driver 
new Xen cloud driver
 2017-04-26 10:59:38 -06:00
Anthony Shaw
e384754cb3
tutorial for the libcloud modules 2017-04-26 15:09:08 +10:00
Anthony Shaw
74b955004b
add docs for new state modules 2017-04-25 21:32:13 +10:00
Anthony Shaw
27b8849ede
add existing libcloud modules to doc index 2017-04-25 17:17:18 +10:00
rallytime
5372f25fde Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/cloud/clouds/rackspace.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
 2017-04-24 15:35:28 -06:00
Anthony Shaw
39c094487d
add a doc page for the state module 2017-04-24 19:17:39 +10:00
Anthony Shaw
e02e27ba68
add doc page 2017-04-24 18:13:47 +10:00
Mike Place
26f5482576 Merge pull request #40809 from gtmanfred/develop 
Add zookeeper managing module and state
 2017-04-21 12:04:25 -06:00
Nicole Thomas
a153f5c204 Merge pull request #40783 from xetus-oss/feature-40755 
Add state.orch_show_sls to the state runner
 2017-04-21 09:45:35 -06:00
Daniel Wallace
b60a8d013a remove rackspace from index 2017-04-21 09:23:05 -06:00
Daniel Wallace
559aa1d8b6 remove deprecated firstgen rackspace cloud driver 2017-04-21 08:59:56 -06:00
Daniel Wallace
0b70e9405f add zookeeper module and state 
Also use __context__ in zk_conncurrency
 2017-04-20 17:56:05 -06:00
Terence Kent
f9cd187631 Add support for performing a state.show_sls for the state runner module. This is a very useful feature when writing orchestrate SLS files. 2017-04-19 16:34:06 -07:00
Enquier
b81856e370 Reordering Write Returners documentation 2017-04-19 14:49:28 -06:00