valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
71,421 Commits 24 Branches 182 Tags 341 MiB
4fdf40cf3e
Commit Graph

71421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
4fdf40cf3e Merge pull request #34830 from sjorge/develop-vmadm-runner 
vmadm runner cleanup and retest
 2016-07-21 08:43:39 -06:00
Mike Place
3849a51b54 Merge pull request #34832 from techhat/systemdrunning 
List running systemd services
 2016-07-21 08:41:52 -06:00
Joseph Hall
fe35181130 List running systemd services 2016-07-20 14:54:49 -06:00
Jorge Schrauwen
1684417cda vmadm runner cleanup and retest 2016-07-20 22:26:11 +02:00
Mike Place
b55b5ea964 Don't open file in binary mode when reading network (#34819) 
Corrects stacktraces in py3 compat.
 2016-07-20 12:38:03 -06:00
Mike Place
2dc02cbb0d Merge pull request #34792 from mollykreis/dev/mkreis/win_timezone_compatibility 
win_timezone: Make timezones on Windows more compatibile with Linux
 2016-07-20 08:52:11 -06:00
Mike Place
e30b324394 Merge pull request #34576 from eidng8/develop 
#28085
 2016-07-20 08:38:01 -06:00
Mike Place
aff29906fc Merge pull request #34671 from isbm/isbm-osmajorrelease-grain-suse-devel 
Add "osmajorrelease" grain
 2016-07-20 08:35:34 -06:00
Mike Place
b986c35a88 Merge pull request #34794 from rallytime/reneable-pam-test 
Renable the pam execution module unit test
 2016-07-20 08:05:50 -06:00
Mike Place
2f27718e8a Merge pull request #34809 from rbjorklin/file-copy-dir 
Made file.copy work for directories
 2016-07-20 08:05:10 -06:00
Mike Place
4253830f9c Merge pull request #34812 from cachedout/remove_file_test 
Remove test for file dir behavior
 2016-07-20 08:04:57 -06:00
Mike Place
b7fe952427 Remove test for file dir behavior 
Refs #34809
 2016-07-20 08:04:00 -06:00
Mike Place
55e34656fd Merge pull request #34808 from DSRCompany/issues/34268_fixup 
Fix problem when no acl configured
 2016-07-20 07:53:20 -06:00
Robin Björklin
aead8a9ae4 Made file.copy work for directories 2016-07-20 11:09:58 +02:00
Dmitry Kuzmenko
0dd0740857 Fix problem when no acl configured 2016-07-20 10:43:57 +03:00
Mike Place
cb1a0866c7 Merge pull request #34797 from cachedout/comment_vmadm_runner 
Comment out localclient in vdadm runner
 2016-07-19 17:01:24 -06:00
Mike Place
49e3f870e9 Comment out localclient in vdadm runner 
Refs #34568
 2016-07-19 16:59:32 -06:00
rallytime
d68b60bff8 Renable the pam execution module unit test 
The logic wasn't correct on the skipIF. We want these test to run
when sys.platform.startswith('OpenBSD') is False.
 2016-07-19 16:15:12 -06:00
Mike Place
8b3b2cfe69 Merge pull request #34268 from DSRCompany/features/23194_publisher_acl_globing 
Regex support in publisher ACL rules.
 2016-07-19 15:37:06 -06:00
Mike Place
3eb49d35cc Merge pull request #34786 from rallytime/iteritems-tests-dir 
Remove all object.iteritems() references from the tests/ directory
 2016-07-19 14:57:21 -06:00
Molly Kreis
05d9d7d8b5 win_timezone: Make timezones on Windows more compatibile with Linux 
zone.tab on Linux uses Asia/Kathmandu rather than Asia/Katmandu. To
make changing the timezone on Windows more compatible with changing
the timezone on Linux, win_timezone should support both spellings of
the city.

Signed-off-by: Molly Kreis <molly.kreis@ni.com>
 2016-07-19 13:49:04 -05:00
Nicole Thomas
b200e89f8e Merge pull request #34787 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-07-19 12:15:27 -06:00
Charles McLaughlin
21f88fcee3 Check for non-existant keys when updating PagerDuty escalation policies (#34705) 
In particular, this allows repeat_enabled and num_loops to be passed to
pagerduty_escalation_policy.present.

Following the existing code, perhaps I should have done something like
this:

    objects_differ = '{0} {1} {2}'.format(k, v, '')

But I don't see the value of objects_differ used as a string, only as
as a bool... so I set it as a bool.

By the way, salt/modules/pagerduty_util.py doesn't return 'changes'..
I'll open a seperate issue for that.
 2016-07-19 12:13:32 -06:00
rallytime
39bc093ee9 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-19 10:31:07 -06:00
Nicole Thomas
1617a7058a Merge pull request #34784 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-19 10:30:18 -06:00
rallytime
7b0ad25b09 Remove iteritems() references from unit/transport/*.py files 2016-07-19 10:22:33 -06:00
rallytime
0ad8183973 Remove iteritems() references from unit/modules/*.py 2016-07-19 10:18:26 -06:00
rallytime
c8930339d3 Remove iteritems() references from integration tests 2016-07-19 10:15:23 -06:00
Bo Maryniuk
038d2c3087 Fix group-add tests for SUSE 2016-07-19 18:01:37 +02:00
rallytime
3e032dc397 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-19 09:30:45 -06:00
Mike Place
bfd87b1218 Merge pull request #34733 from at0S/add-attach-eni-to-instance 
Add an option to attach ENI to instance via name or id
 2016-07-19 07:00:48 -06:00
Mike Place
ab0ee501ec Merge pull request #34763 from cro/nebula_dns 
Nebula dns
 2016-07-19 06:58:28 -06:00
Mike Place
a4a737e966 Merge pull request #34755 from pass-by-value/aws_vpc_peering 
Add support for aws VPC peering connections
 2016-07-19 06:47:25 -06:00
Mike Place
58021035a9 Merge pull request #34773 from randomed/mysql-returner-startup/2015.8 
Bugfix: Startup states on minions are not being written to mysql returner
 2016-07-19 06:39:53 -06:00
Mike Place
6b22c29d06 Merge pull request #34764 from rallytime/six-iteritems 
Change iteritems() to six.iteritems in modules, states, returners, etc.
 2016-07-19 06:39:20 -06:00
Dave Ye
0cd55eb7d7 Add jid=req handling for mysql returner. It should also store the return jid into the jid list table. 2016-07-19 15:41:23 +10:00
jc
ba2d720061 fix indentation 2016-07-19 09:34:56 +08:00
Taras Yermolenko
707ed0e371 fixed lint violations 2016-07-19 10:58:19 +10:00
C. R. Oldham
398cdde4ff Lint. 2016-07-18 16:28:20 -06:00
rallytime
4da27821e3 Rempve iteritems() reference from log4mongo_mod handler 2016-07-18 16:22:37 -06:00
rallytime
242a416a64 Remove iteritems() reference from state.py 2016-07-18 16:21:42 -06:00
rallytime
1b2ec41f70 Remove iteritems() references from state modules 2016-07-18 16:21:04 -06:00
rallytime
46cfb5e03d Remove iteritems() references from boto_ec2 state and fix salt.utils import 2016-07-18 16:15:15 -06:00
rallytime
f8965de804 Remove iteritems() references in returner modules 2016-07-18 16:11:38 -06:00
rallytime
80dee73979 Remove iteritems() references in pillar modules 2016-07-18 16:09:15 -06:00
rallytime
7ab20e259b Remove iteritems() references from execution modules 2016-07-18 16:02:48 -06:00
rallytime
c2f3404988 Remove iteritems() references in init_manage and cleanup salt.utils import 2016-07-18 15:57:36 -06:00
rallytime
b131f905b6 Remove iteritems() references from github execution module 2016-07-18 15:57:16 -06:00
rallytime
4d9ca1ebf9 Remove iteritems() references in boto execution modules 2016-07-18 15:53:55 -06:00
C. R. Oldham
bf4dc079df Document fqdn_base. 2016-07-18 15:49:59 -06:00