valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
87,316 Commits 24 Branches 182 Tags 341 MiB
28343f0120
Commit Graph

87316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nasenbaer13
c3b97e35d4 Merge branch 'develop' into boto_asg 2017-10-17 09:59:47 +02:00
Tim Freund
9557504b75
Insert missing verb in gitfs walkthrough 2017-10-16 20:27:56 -04:00
Mike Place
b651ff0534 Merge pull request #44129 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-10-16 16:48:16 -06:00
Mike Place
8d1c1e21f0
Fix typos in paralell states docs 2017-10-16 16:43:10 -06:00
Gareth J. Greenaway
2ba749e841
Updating some formatting. 2017-10-16 14:38:32 -07:00
Gareth J. Greenaway
00063e8fc7
Updating error messages to be more clear when beacons are configured in pillar. Updating the list to ensure the parameters are clear. 2017-10-16 14:32:12 -07:00
Gareth J. Greenaway
2738a124fe
Some cleanup of duplicated code. Fixing event comments. 2017-10-16 14:32:12 -07:00
Gareth J. Greenaway
a89c26c88e
Various fixes to beacons to handle situations when beacons are stored in pillar. Updating execution module to report that beacons stored in pillar can not be managed via module. Updating add function to ensure beacon is available before attempting to add it. Updaitng unit tests to include new beacon is available check. 2017-10-16 14:32:12 -07:00
Matthew Summers
bebf301976
fixed test addressing issue #43307, disk.format_ to disk.format 2017-10-16 16:35:57 -04:00
Matthew Summers
b4ba7ae2fc
addresses issue #43307, disk.format_ to disk.format 
This change fixes breakage. It appears the disk.format_ func is
aliased to disk.format in modules/disk.py
 2017-10-16 16:35:18 -04:00
Nicole Thomas
9dacbf69b9 Merge pull request #44127 from terminalmage/salt.utils 
Add top-level docstrings to a bunch of salt.utils modules which are missing them
 2017-10-16 16:28:27 -04:00
Erik Johnson
3e96225210
Use one salt.utils.gitfs.GitFS instance per thread 
This reduces some of the overhead caused by many concurrent fileclient
requests from minions.

Additionally, initializing remotes has been folded into the GitBase
class' dunder init. Instantiating an instance and initializing its
remotes were initially split so that an object could simply be created
with the master opts so that the configuration was loaded and nothing
else, allowing for certain cases (like clearing the cache files) where
we didn't need to actually initialize the remotes. But this both A)
presents a problem when the instance being used is a singleton, as you
don't want to be re-initializing the remotes all the time, and B)
suppressing initialization can be (and is now being) done via a new
argument to the dunder init.
 2017-10-16 15:25:29 -05:00
Sergey Kizunov
351d16840b
Move strip_uri to salt/utils/pkg/deb.py 
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-10-16 15:23:36 -05:00
Mike Place
a9700f6061 Merge pull request #44055 from eyj/jid_queue 
Activate jid_queue also for SingleMinions to workaround (Backport)
 2017-10-16 14:14:51 -06:00
Mike Place
6c3a500beb Merge pull request #44060 from The-Loeki/doc-roster 
doc fixes for salt-ssh roster(s) opts
 2017-10-16 14:12:40 -06:00
Nicole Thomas
2fba45cd3f Merge pull request #44125 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.2 to 2017.7
 2017-10-16 16:02:24 -04:00
Nicole Thomas
68974aa74d Merge pull request #44029 from msummers42/2017.7 
addresses issue #43307, disk.format_ to disk.format
 2017-10-16 15:59:19 -04:00
Nicole Thomas
d0bbe65ffa Merge pull request #44079 from skizunov/develop2 
opkg: Fix usage with pkgrepo.managed
 2017-10-16 15:58:12 -04:00
rallytime
54c4be35ae
Update any moved utils references from the merge-forward 2017-10-16 15:47:32 -04:00
Pratik Bandarkar
a685f458ed add "auto_delete" option to "attach_disk" and "create_attach_volumes" 
for GCP.

fixes #44101

  - This fix will allow user to specify "auto_delete" option with
    attach_disk or "create_attach_volumes" function
 2017-10-16 19:33:48 +00:00
rallytime
c0f16dae74
Merge branch '2017.7' into 'develop' 
Conflicts:
  - doc/topics/tutorials/index.rst
  - salt/crypt.py
  - salt/modules/cmdmod.py
  - salt/modules/grains.py
  - salt/pillar/git_pillar.py
  - salt/roster/clustershell.py
  - tests/unit/states/test_augeas.py
  - tests/unit/utils/test_utils.py
 2017-10-16 15:26:19 -04:00
Mike Place
3a68e356f8 Merge pull request #44093 from gtmanfred/fix-44087 
don't filter if return is not a dict
 2017-10-16 13:13:18 -06:00
Nicole Thomas
c785d7a847 Merge pull request #44122 from cachedout/gpg_pr_template 
Add note about GPG signing to PR template
 2017-10-16 15:09:37 -04:00
Nicole Thomas
bf90ea1f51 Merge pull request #44124 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.11.8 to 2016.11
 2017-10-16 15:07:13 -04:00
Mike Place
4d13e1961f Merge pull request #44119 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 25
 2017-10-16 13:07:02 -06:00
Nicole Thomas
22a8253595 Merge pull request #44090 from pratik705/fix-create_attach_volumes_salt-cloud_action-GCP 
Fix create_attach_volumes salt-cloud action for gcp
 2017-10-16 15:04:21 -04:00
Mike Place
e41e3d76be Typo fix 2017-10-16 13:00:11 -06:00
nasenbaer13
4bdd5bbf6b Merge branch '2017.7' into jid_queue 2017-10-16 20:45:29 +02:00
Nicole Thomas
96dc6b0171 Merge pull request #44015 from gtmanfred/develop 
convert jinja context to dictionary
 2017-10-16 14:39:29 -04:00
Erik Johnson
473fbb18e9
Add top-level docstrings to a bunch of salt.utils modules which are missing them 2017-10-16 13:38:41 -05:00
Nicole Thomas
13f3ffa83a Merge pull request #44097 from gtmanfred/openneb 
OpenNebula does not require the template_id to be specified
 2017-10-16 14:36:16 -04:00
Nicole Thomas
b13e129c6b Merge pull request #44117 from sahama/patch-1 
show_all remove
 2017-10-16 14:29:57 -04:00
Nicole Thomas
888e5f51a2 Merge pull request #44121 from benediktwerner/2017.7 
Fixed code snippet in unit testing documentation
 2017-10-16 14:28:36 -04:00
Nicole Thomas
9fe94d7843 Merge pull request #44098 from twangboy/win_mock_test_parsers 
Return multiprocessing queue in LogSetupMock class
 2017-10-16 14:14:29 -04:00
Nicole Thomas
413de95df2 Merge pull request #44103 from terminalmage/salt.utils 
Complete the salt.utils refactor
 2017-10-16 14:12:50 -04:00
rallytime
c4ae4a6b50
Merge branch '2017.7.2' into '2017.7' 
Conflicts:
  - doc/topics/releases/2017.7.2.rst
 2017-10-16 13:53:13 -04:00
rallytime
59861291c8
Merge branch '2016.11.8' into '2016.11' 
No conflicts.
 2017-10-16 13:29:07 -04:00
Nicole Thomas
0ee04eaf1d Merge pull request #44118 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-10-16 13:01:37 -04:00
twangboy
a0972704e5
Fix bad headings 2017-10-16 10:51:34 -06:00
twangboy
601d8bc5af
Add release notes 2017-10-16 10:51:34 -06:00
twangboy
e22b2a4856
Fix some grammer issues in the docs 2017-10-16 10:51:33 -06:00
twangboy
78124181cd
Fix typo 2017-10-16 10:51:33 -06:00
twangboy
7bcf8b48ec
Update documentation with new changes to installer 2017-10-16 10:51:33 -06:00
twangboy
e9075725dc
Add documenting comments 2017-10-16 10:51:33 -06:00
twangboy
7fe2350365
Add support for multimaster setup 
Allows you to pass a comma-delimited list of masters to the master combo
box or the /master command line switch
Parses the existing minion config file to get multimaster settings
Adds an checkbox to use the existing config in the minion config page
When the box is checked, show the existing config grayed out
When unchecked, show default values
Adss the /use-existing-config= command line switch for use from the
command line
Adds support for a help switch on the command line (/?) to display the
supported command line paramaters
 2017-10-16 10:51:33 -06:00
twangboy
a4e2d8059d
Fix unit.templates.test_jinja for Windows 
Fix problem with files that end with new line on Windows
Fix some problems with regex
Fix some unicode conversion issues
 2017-10-16 10:41:36 -06:00
Mike Place
33bf0e1733 Merge pull request #44091 from quinot/bug/clustershell-host-addr-confusion 
Confusion between host name and address
 2017-10-16 10:25:01 -06:00
Mike Place
28fa097b9b Merge pull request #44099 from twangboy/win_skip_test_parsers 
Skip Master, Minion, and Syndic parser tests
 2017-10-16 10:06:59 -06:00
Mike Place
37c7980880
Add note about GPG signing to PR template 2017-10-16 10:03:02 -06:00
Mike Place
ac3e4df964 Merge pull request #44110 from roaldnefs/fix-doc-local-returner 
Format fix code example local returner doc
 2017-10-16 09:57:49 -06:00