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
84,094 Commits 24 Branches 182 Tags 341 MiB
ffa4bddcad
Commit Graph

84094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
77969c4161 Merge pull request #44168 from twangboy/win_skip_pam_eath 
Fix `unit.test_auth` for Windows
 2017-10-19 10:12:21 -04:00
Ch3LL
cd79e9444e
remove unneded kwarg 2017-10-18 17:21:52 -04:00
Ch3LL
1541376c4f
Add spm build test 2017-10-18 17:15:42 -04:00
twangboy
bb1d2eb85b
Skip tests that are failing on PAM eauth 2017-10-18 14:03:10 -06:00
Gareth J. Greenaway
5f7555846f
When looping through the various pre, post, up and down commands put them into the interface dict using the right internet family variable. 2017-10-18 12:51:29 -07:00
Erik Johnson
7b46489e33 Fix examples in docker_container.{stopped,absent} docstrings 
These were erroneously changed from `dockerng.{stopped,absent}` to
`docker.{stopped,absent}` using sed, when they should have been changed
to reflect the new name of this state module (like the
`docker_container.running` examples were).
 2017-10-18 13:34:11 -05:00
Daniel Wallace
d3d00c3e62
add changes to test return 2017-10-18 11:25:44 -06:00
Benedikt Werner
bd825b51cc
Changed sensehat versionadded from 2017.7 to 2017.7.0 2017-10-18 19:08:59 +02:00
Vasili Syrakis
534faf0b7a
Catch on empty Virtualbox network addr #43427 2017-10-18 13:00:25 -04:00
Benedikt Werner
f1d3c5bbcf
Added 'versionadded' tags to sensehat modules 2017-10-18 18:54:54 +02:00
Mike Place
88a776d9d2 Merge pull request #44151 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-10-18 10:52:29 -06:00
Nicole Thomas
0b47eb7242 Merge pull request #43933 from gtmanfred/2017.7 
if expect_minions is passed use that instead
 2017-10-18 12:43:38 -04:00
Nicole Thomas
d177240cfc Merge branch '2017.7' into git-noexec-fix 2017-10-18 12:40:10 -04:00
Nicole Thomas
36da1a7fac Merge pull request #44081 from skizunov/develop3 
Windows: Fix usage of pkgrepo state
 2017-10-18 12:16:45 -04:00
rallytime
6aa8f03a4a
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/states/blockdev.py
  - tests/unit/states/test_blockdev.py
 2017-10-18 09:31:39 -04:00
Ken Crowell
f3980d7d83
Fix manage.present to show lost minions 
Fixes #38367 and and #43936.
 2017-10-17 21:43:21 -03:00
Andreas Lutro
1e1e5a3ff6 try to correctly parse debian codename from /etc/os-release 2017-10-17 23:40:14 +02:00
Mike Place
afcaa0c591 Merge pull request #43913 from twangboy/win_fix_test_jinja 
Fix `unit.templates.test_jinja` for Windows
 2017-10-17 15:09:04 -06:00
Mike Place
fc5754c6a1 Merge pull request #43917 from twangboy/win_unit_test_pillar 
Fix `unit.test_pillar` for Windows
 2017-10-17 15:06:45 -06:00
Daniel Wallace
272dcc6ba5
add inline comment about popping expect_minions 2017-10-17 14:58:07 -06:00
Daniel Wallace
b615ce1762
if expect_minions is passed use that instead 
In the salt/states/saltmod.py, we set expect minions sometimes and pass that
through.  In this instance, we should use the expect_minions that is passed so
that it does not get passed along twice.
 2017-10-17 14:58:07 -06:00
Nicole Thomas
6252f82f58 Merge pull request #44133 from cachedout/fix_paralell_docs 
Fix typos in parallel states docs
 2017-10-17 11:24:18 -04:00
Nicole Thomas
0cd493b691 Merge pull request #44131 from rallytime/bp-44029 
Back-port #44029 to 2016.11
 2017-10-17 11:05:38 -04:00
Mike Place
0d3f5db867 Merge pull request #44135 from timfreund/insert_missing_verb 
Insert missing verb in gitfs walkthrough
 2017-10-17 08:32:13 -06:00
Tim Freund
9557504b75
Insert missing verb in gitfs walkthrough 2017-10-16 20:27:56 -04:00
Mike Place
8d1c1e21f0
Fix typos in paralell states docs 2017-10-16 16:43:10 -06: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
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
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
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
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
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
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
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
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
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
Benedikt Werner
1319c822bd
Fixed code snippet in unit testing doc 2017-10-16 17:23:23 +02:00