valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,185 Commits 24 Branches 182 Tags 341 MiB
fb008e6f84
Commit Graph

2266 Commits

Author SHA1 Message Date
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
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
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
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