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
60,793 Commits 24 Branches 182 Tags 341 MiB
abe3003aed
Commit Graph

5870 Commits

Author SHA1 Message Date
Mike Place
abe3003aed Merge pull request #28204 from DSRCompany/issues/23157_rename_client_acl 
Deprecate client_acl with publisher_acl (rename)
 2015-10-26 08:04:56 -06:00
Mike Place
05ed7d0bdc Merge pull request #28226 from plastikos/improvement-module_package_collision 
Improvement module package collision
 2015-10-26 07:04:47 -06:00
justinta89
835a11b6be Fixed win_firewall_test 2015-10-23 09:53:03 -06:00
Dmitry Kuzmenko
022c8bdf7e Fixed unit test 2015-10-23 17:26:15 +03:00
Dmitry Kuzmenko
7a5204ef02 Deprecate client_acl with publisher_acl (rename) 
Keeping client_acl support
 2015-10-23 11:59:40 +03:00
Thayne Harbaugh
a584ba567b Test for loader collisions between modules and packages 
What gets loaded from the following layout?:

  foo.py:bar()
  foo/__init__.py:bar()

This used to raise an exception (up until yesterday).  For now this ensures
that foo/__init__.py:bar() has higher priority than foo.py:bar() when
foo.bar() is referenced.
 2015-10-22 13:49:09 -06:00
justinta89
a74dbad74a Started fixing win_firewall_test 2015-10-22 13:12:31 -06:00
Colton Myers
c89d63650e Quiet pylint 2015-10-21 15:10:52 -06:00
Colton Myers
a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/config/__init__.py
    salt/modules/git.py
    salt/modules/hosts.py
    salt/modules/htpasswd.py
    salt/states/boto_secgroup.py
    salt/states/htpasswd.py
    tests/unit/modules/schedule_test.py
 2015-10-20 18:13:11 -06:00
Marek Skrobacki
f735792846 s6 service module 2015-10-20 11:43:09 +01:00
Mike Place
1db6406bef Merge pull request #28013 from rallytime/bp-27891 
Back-port #27891 to 2015.8
 2015-10-19 06:57:51 -06:00
rallytime
9ea33bf0e4 Pylint fixes 2015-10-16 07:22:46 -06:00
Domingo Kiser
4af5b5c33f introduce recurse_list pillar_source_merging_strategy 2015-10-16 05:24:40 -06:00
justinta89
cd67843bd0 Fix schedule_test failure 2015-10-15 14:49:26 -06:00
Colton Myers
153087a7b4 Merge pull request #26945 from dr4Ke/feature_state_grains_support_nested_and_dict 
Feature state grains support nested and dict
 2015-10-15 14:25:44 -06:00
justinta89
d88ac2589f Changed grain to look at osmajorrelease instead of osrelease 2015-10-14 10:42:55 -06:00
Erik Johnson
2d0b16559e Merge pull request #27676 from ticosax/no-more-arg-to-docker-start 
[dockerng] WIP No more runtime args passed to docker.start()
 2015-10-14 08:38:41 -05:00
Colton Myers
6537da77fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/grains/core.py
    salt/loader.py
    salt/minion.py
    salt/modules/dockerng.py
    salt/modules/rest_package.py
    salt/modules/ssh.py
    salt/modules/state.py
    salt/modules/timezone.py
    salt/modules/zypper.py
    salt/runners/state.py
    salt/state.py
    salt/states/virtualenv_mod.py
    salt/utils/cloud.py
 2015-10-13 17:27:48 -06:00
Colton Myers
722327ee5f Merge pull request #27885 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-10-13 16:44:20 -06:00
Colton Myers
5ecd5615f2 Remove failing heavily-mocked test 2015-10-13 15:08:40 -06:00
Nicolas Delaby
a1d0ba392f fixup! Do not pass any argument to docker.start 2015-10-13 20:53:11 +02:00
Nicolas Delaby
65c8762e1f Do not pass any argument to docker.start 
docker.create is responsible to manage all of them, since docker API 1.16
 2015-10-13 19:39:32 +02:00
Mike Place
59e93ddde6 Merge pull request #27521 from terminalmage/zh107 
Remove raw string formatting in execution modules
 2015-10-13 10:57:08 -06:00
Mike Place
36f05fb526 Merge pull request #27882 from twangboy/win_task_module 
Created win_task.py module
 2015-10-13 10:54:13 -06:00
Erik Johnson
50cb56d7f6 Update raet_publish unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
7de02e95e9 Update darwin_pkgutil unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
ca9c478fa7 Update gem unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
71d57248d7 Update postgres unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
aef6c39c04 Update rvm unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
0210ef4434 Update mac_user unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
76ce6949d7 Update at unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
d2ad1d7892 Update rsync unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
Erik Johnson
362a91d42b Remove rsync.config test since mock_open can't handle iterative reads 2015-10-13 10:52:59 -05:00
Erik Johnson
b1c60121bd Update virtualenv unit tests to reflect changes in execution module 2015-10-13 10:52:58 -05:00
Erik Johnson
a5d6a3e768 Update pw_user unit tests to reflect changes in execution module 2015-10-13 10:52:58 -05:00
Erik Johnson
93815e6e39 remove rbenv test that doesn't really test anything 2015-10-13 10:52:58 -05:00
Mike Place
6d46a38d5d Whitespace lint 
Refs #27891
 2015-10-13 09:15:12 -06:00
Mike Place
a158cd50e6 Merge pull request #27746 from alprs/fix-timedatectl_failure 
timezone module: handle timedatectl errors
 2015-10-13 08:55:27 -06:00
Mike Place
9dc19caa79 Merge pull request #27816 from alprs/fix-reboot_delay 
Make system.reboot use `shutdown -r` when available
 2015-10-13 08:52:06 -06:00
Domingo Kiser
a8adaa8f9e introduce recurse_list pillar_source_merging_strategy 2015-10-12 21:59:39 -07:00
twangboy
14e060ed9c Fixed some tests 2015-10-12 16:54:10 -06:00
Erik Johnson
922e2018ef Merge pull request #27731 from cro/dunder_proxy 
Add __proxy__ to replace opts['proxymodule']
 2015-10-12 15:41:22 -05:00
Andreas Lutro
04ef51e524 make system.reboot use shutdown -r when available 
see issue #27710
 2015-10-12 21:54:42 +02:00
Justin Findlay
bc0f167850 update timezone mod unit tests for errors 2015-10-12 11:39:03 -06:00
Mike Place
ba2a39d4b7 Merge pull request #27748 from multani/fix-8646 
Fix #8646
 2015-10-12 09:55:57 -06:00
C. R. Oldham
b049377cbe Remove rest_sample_test, it wasn't testing anything 2015-10-12 08:34:36 -06:00
Richard Hansen
9aa19575fa new ldap state module 2015-10-09 17:47:56 -04:00
Erik Johnson
2ae7ada3c9 Merge pull request #27741 from ticosax/docker.containers-filters 
[dockerng] pass filters argument to dockerng.ps
 2015-10-07 22:40:14 -05:00
Colton Myers
69d960f8e6 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    doc/topics/ssh/index.rst
    salt/modules/boto_secgroup.py
    salt/modules/dockerng.py
    salt/states/archive.py
    salt/states/boto_elb.py
    salt/states/boto_secgroup.py
    tests/unit/modules/schedule_test.py
 2015-10-07 13:11:48 -06:00
Colton Myers
35425b14ad Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/man/salt-api.1
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt-key.1
    doc/man/salt-master.1
    doc/man/salt-minion.1
    doc/man/salt-run.1
    doc/man/salt-ssh.1
    doc/man/salt-syndic.1
    doc/man/salt-unity.1
    doc/man/salt.1
    doc/man/salt.7
    salt/modules/pip.py
    salt/states/user.py
 2015-10-07 12:06:12 -06:00