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
83,196 Commits 24 Branches 182 Tags 341 MiB
aff5d76081
Commit Graph

7469 Commits

Author SHA1 Message Date
garethgreenaway
bd3ed3a7c5 Merge branch 'develop' into patch-1 2017-06-22 12:00:30 -07: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
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
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
Mike Place
56e1d3bc10 Merge pull request #41827 from alexbleotu/jinja_tests-gh 
JINJA tests
 2017-06-19 14:59:46 -05:00
Alexandru Bleotu
e42d1172a8 Added Tests section in JINJA documentation 2017-06-19 17:15:23 +01: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
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