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
64,701 Commits 24 Branches 182 Tags 341 MiB
f5aa107583
Commit Graph

1819 Commits

Author SHA1 Message Date
rallytime
d31b0d1573 Merge branch '2015.8' into develop 2015-11-04 15:40:03 -07:00
Mike Place
7ca7ed4b37 Merge pull request #28579 from jfindlay/virt_ret 
fix __virtual__ returns: tls,uptime mods
 2015-11-04 15:00:02 -07:00
Justin Findlay
333c132378 fix __virtual__ returns: tls,uptime mods 2015-11-04 13:10:38 -07:00
Mike Place
ec924e8410 Merge pull request #28560 from bdrung/2015.8 
Fix various typos
 2015-11-04 08:06:36 -07:00
Benjamin Drung
470e82f17f Fix typo an dictionnary -> dictionary 2015-11-04 11:06:09 +01:00
Justin Findlay
11a9a5868f simplify timezone module unit test mocks 2015-11-03 19:37:54 -07:00
Justin Findlay
476b651c94 update timezone module unit tests for timedatectl 2015-11-03 19:34:01 -07:00
Colton Myers
422c641233 Remove test failing because of mocks -- it's deprecated anyway 2015-11-02 19:42:01 -07:00
Colton Myers
32969b2408 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    salt/cloud/clouds/digital_ocean.py
    salt/cloud/clouds/linode.py
    salt/loader.py
    salt/modules/blockdev.py
    salt/modules/boto_route53.py
    salt/modules/boto_vpc.py
    salt/modules/bsd_shadow.py
    salt/modules/file.py
    salt/modules/rabbitmq.py
    salt/modules/schedule.py
    salt/modules/win_network.py
    salt/runners/state.py
    salt/spm/__init__.py
    tests/unit/modules/blockdev_test.py
 2015-11-02 18:19:01 -07:00
Colton Myers
238411c8ce Merge pull request #28464 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-11-02 13:18:21 -07:00
Colton Myers
6f6e687cb4 Mock master_uri for even tests 2015-11-02 12:15:53 -07:00
Mike Place
da62fdc1e7 Merge pull request #28498 from rominf/postgres-quotes 
[modules/postgres] quote identifiers in SQL
 2015-11-02 12:11:57 -07:00
Roman Inflianskas
0184ecaba7 [modules/postgres] fix tests 2015-11-02 20:53:18 +03:00
Mike Place
7c81188f67 Merge pull request #28421 from rominf/service_run 
[modules/service] Add run function to run services with custom arguments
 2015-11-02 10:43:54 -07:00
Christophe Drevet-Droguet
c63913e602 grains module: simpler comment for already set key 2015-11-02 09:31:44 -05:00
Roman Inflianskas
5d0ef71b3d [tests/unit][modules/service] add service.run, fix service.* 2015-10-31 14:42:05 +03:00
Roman Inflianskas
6190d6699e [modules/service] add service.run 2015-10-31 14:41:58 +03:00
Roman Inflianskas
233b9163a5 [tests/unit][modules/hg] add hg.status 2015-10-31 14:30:08 +03:00
justinta89
7ca79f1f7b Skipped wipefs test if wipefs does not exist on OS 2015-10-30 15:04:33 -06:00
Mike Place
558be2e033 Merge pull request #28352 from rominf/check_or_die_to_virtual 
Replace all check_or_die to __virtual__
 2015-10-29 13:41:33 -06:00
Daniel Hobley
a78aab3255 Added the ability to change the "hostname" on windows minions 2015-10-29 11:39:22 +01:00
Roman Inflianskas
e299fc3ff2 Replace check_or_die functions to __virtual__ 2015-10-29 10:59:58 +03:00
Erik Johnson
a44c8d8dab Merge pull request #28270 from rallytime/refactor_rabbitmq_plugin_state 
Refactor RabbitMQ Plugin State to correctly use test=true and format errors
 2015-10-27 11:18:34 -06:00
Erik Johnson
4efd07eba5 Merge pull request #28269 from rallytime/refactor_rabbitmq_user_state 
Refactor rabbitmq_user state to use test=True correctly
 2015-10-27 11:17:42 -06:00
rallytime
9e40c3a6a6 Fine tuning and fix tests 2015-10-27 10:30:00 -04:00
rallytime
65fdb50246 Get the list indice to compart before looking at keys 2015-10-26 14:20:27 -04:00
rallytime
19b8b868a3 Clean-up/fixes to rabbitmq_user state and test adjustments 2015-10-26 13:48:50 -04:00
rallytime
95defb87c5 Add test for availability_zone check to boto_vpc_tests 2015-10-26 10:15:29 -04:00
Justin Findlay
0dc72135de update blockdev exec and state module unit tests 2015-10-23 18:12:43 -06:00
Marek Skrobacki
f735792846 s6 service module 2015-10-20 11:43:09 +01: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
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
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
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
twangboy
14e060ed9c Fixed some tests 2015-10-12 16:54:10 -06: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
C. R. Oldham
b049377cbe Remove rest_sample_test, it wasn't testing anything 2015-10-12 08:34:36 -06:00
Eren Güven
2caf1d21d6 fix test 2015-10-08 14:57:33 +02: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
Nicolas Delaby
821ed72f37 pass filters argument to dockerng.ps 2015-10-07 15:06:16 +02:00
Nicolas Delaby
edf625c8b4 Add support of labels parameter for dockerng 2015-10-06 13:18:05 +02:00
Colton Myers
77516912fa Merge pull request #27630 from ticosax/include-container-id-docker-mine 
Expose container_id in mine.get_docker
 2015-10-05 15:56:53 -06:00
Colton Myers
7a4291008e Merge pull request #27689 from rallytime/fix-tests-27448 
Merge #27448 with test fixes
 2015-10-05 15:17:41 -06:00
rallytime
05a506ec9f Use correct comment in test 2015-10-05 14:02:13 -06:00
rallytime
8296fefb31 Merge #27448 with test fixes 2015-10-05 12:33:03 -06:00
Ethan Moore
c7aea90546 Adding tags to OrderedDict in test module 
Adding SaltInvocationError import
 2015-10-02 20:10:07 +00:00
Nicolas Delaby
9e56a7e9db Expose container_id in mine.get_docker 
Because sometimes we should be able to perform additional introspection.
 2015-10-02 21:30:33 +02:00
Mike Place
fd11e0cd95 Merge pull request #27522 from twangboy/fix_26629 
Removed dependency on powershell to restart salt-minion
 2015-09-30 10:19:29 -06:00
Colton Myers
1f3eb1c526 Remove useless mocked unit test 2015-09-29 18:23:46 -06:00
Colton Myers
41cad702e3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/rest_service.py
    salt/states/dockerng.py
    salt/utils/cloud.py
 2015-09-29 18:13:33 -06:00
twangboy
163c54505d Fixed tests... hopefully 2015-09-29 15:28:23 -06:00
Colton Myers
73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/gce.rst
    doc/topics/windows/windows-package-manager.rst
    salt/client/ssh/state.py
    salt/cloud/clouds/ec2.py
    salt/modules/defaults.py
    salt/modules/file.py
    salt/utils/cloud.py
 2015-09-29 14:56:41 -06:00
Nicolas Delaby
b184faa55b Enforce usage of host_config and require docker-py>=1.4.0 2015-09-28 23:24:57 +02:00
Mike Place
0bc37c0d41 Fix test 2015-09-28 12:57:22 -06:00
Nicolas Delaby
a1ed6cda56 Skip test if docker-py is not installed 2015-09-28 19:53:10 +02:00
Mike Place
74095b6b22 Lint 2015-09-28 11:48:51 -06:00
Nicolas Delaby
cc8471bd1b dockerpy expect only command argument not cmd 2015-09-28 10:08:40 -05:00
Daniel Hobley
f972c39333 Lint fixes 2015-09-24 12:41:56 +02:00
Daniel Hobley
40db871e2b Added the ability to trim the returned files from an unzip 
- This reduces log spamming when you unzip thousands of files, it defaults to off
 2015-09-24 11:43:21 +02:00
Mike Place
f63f4d8c43 Merge pull request #27289 from terminalmage/encrypted-cli-pillar 
Feature add: Encrypted CLI pillar data
 2015-09-22 10:34:13 -06:00
Erik Johnson
bacc76c355 Update mocked objects for state module tests 
Added the new pillar_enc value
 2015-09-22 08:25:51 -05:00
Colton Myers
9864d9e0fa Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/index.rst
    doc/topics/releases/boron.rst
    salt/cli/daemons.py
    salt/cli/salt.py
    salt/modules/jboss7.py
    salt/states/file.py
 2015-09-18 11:03:37 -06:00
Colton Myers
1cbfa06591 Remove heavily-mocked failing test 2015-09-17 14:38:05 -06:00
Colton Myers
26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    salt/config/__init__.py
    salt/modules/rh_ip.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/user.py
    salt/templates/rh_ip/rh7_eth.jinja
 2015-09-17 11:10:37 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
 2015-09-17 10:54:33 -06:00
twangboy
7992b7e20a Fixed some tests... hopefully... 2015-09-15 16:27:47 -06:00
Christophe Drevet-Droguet
557e642ddf grains module: simpler comment for already set key 2015-09-15 17:49:49 +02:00
Colton Myers
ab519fb5ff Remove heavily-mocked unit tests 2015-09-14 17:00:02 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
 2015-09-14 14:39:03 -06:00
Justin Findlay
b36a7107b2 update win_path exec module unit tests 2015-09-10 15:17:46 -06:00
Erik Johnson
30a4915762 Update tests to reflect changes to timezone module 2015-09-10 11:05:38 -05:00
Evgeny Vereshchagin
8f77b743cd Use localectl for locale setting on Debian if available 2015-09-04 04:06:55 +03:00
Joe Julian
6108ec4280 Gated dbus for os families that use it 
Gated the dbus include for os families that are currently using it
within this module at this time.

Renamed some defs to more appropriately express their function.
 2015-09-01 15:19:49 -07:00
Colton Myers
278e8dda5b Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/gce.py
 2015-09-01 15:15:13 -06:00
Mike Place
3c4523237f Merge pull request #26810 from Unity-Technologies/feature/global-environ-win 
Added the ability to set permanent environment variables on windows
 2015-09-01 11:42:06 -06:00
Daniel Hobley
1c8e6e067f Fixed lint issues 2015-09-01 13:56:43 +02:00
Daniel Hobley
fc724158de Added the ability to set permanent environment variables on windows 2015-08-31 13:47:29 +02:00
Erik Johnson
a605607709 Remove git unit tests, moving them to salt.utils.url tests 2015-08-29 21:14:20 -05:00
Colton Myers
1bbe45538e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/__init__.py
    salt/modules/smartos_vmadm.py
    salt/utils/s3.py
    setup.py
 2015-08-28 16:44:08 -06:00
Colton Myers
b509cdfa4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/linode.py
    salt/grains/ssds.py
    salt/modules/git.py
    salt/modules/pip.py
    tests/integration/cloud/providers/gogrid.py
    tests/integration/cloud/providers/linode.py
    tests/integration/cloud/providers/msazure.py
    tests/integration/cloud/providers/rackspace.py
    tests/unit/modules/pip_test.py
 2015-08-28 16:33:54 -06:00
Erik Johnson
1ed42ea4fd Remove git unit tests, moving them to salt.utils.url tests 2015-08-28 15:41:33 -05:00
Colton Myers
9e88672e5a Merge pull request #26683 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-27 15:28:14 -06:00
Mike Place
cfc61c6629 Merge pull request #26688 from richardhansen/states.host.only 
new salt.states.host.only() function to limit names associated with an IP
 2015-08-27 14:23:00 -06:00
Colton Myers
c3a6280f8c Merge pull request #26617 from terminalmage/issue9592 
Fix Windows failures in pip module due to raw string formatting
 2015-08-27 13:24:53 -06:00
Gareth J. Greenaway
c11cf22abe fixing ipset unit tests based on changes. Adding additional tests for when ip set type is hash:net 2015-08-27 08:28:23 -07:00
Erik Johnson
106f386df3 tests/unit/modules/cron_test.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Richard Hansen
9af7f900d4 salt.modules.hosts.set_host: remove entry if alias is empty 2015-08-26 20:21:45 -04:00
Colton Myers
64cad371f0 Remove overmocked test 2015-08-26 16:02:42 -06:00
Colton Myers
76c70162db Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    doc/topics/spm/index.rst
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/opennebula.py
    salt/cloud/clouds/openstack.py
    tests/unit/states/file_test.py
 2015-08-26 14:47:33 -06:00
Colton Myers
9b34335a20 Merge pull request #26359 from Akilesh1597/develop 
Ini issues fixed
 2015-08-25 15:47:48 -06:00
Colton Myers
6e72ae7f91 Merge pull request #26647 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-25 15:15:28 -06:00
Colton Myers
353ec1ba7a Remove bad test 2015-08-25 14:08:04 -06:00
Colton Myers
3d6f7b0e6a Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/utils/aws.py
 2015-08-25 13:57:49 -06:00
Colton Myers
ed940ad5f5 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/openstack.py
    tests/unit/modules/artifactory_test.py
    tests/unit/modules/groupadd_test.py
    tests/unit/modules/jboss7_test.py
    tests/unit/states/jboss7_test.py
 2015-08-25 13:55:44 -06:00
Erik Johnson
ede057eebc Fix tests to reflect args being passed as lists instead of strings 2015-08-24 23:54:09 -05:00
Pedro Algarvio
016e350c0f Merge pull request #26541 from terminalmage/masterless-winrepo 
Make winrepo execution module use the same code as the runner
 2015-08-22 22:47:31 +01:00
Erik Johnson
81a0d4c915 Skip tests that don't work with older mock 
This fixes test failures on RHEL6 builds.

This also removes two win_network tests which were clearly made to pass
only in Jenkins, and not in a chrooted build environment.
 2015-08-21 21:35:11 -05:00
Colton Myers
75f48b4a96 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/targeting/grains.rst
 2015-08-21 16:48:48 -06:00
Colton Myers
55ecff1278 Merge branch 'merge-forward-2015.8' of https://github.com/basepi/salt into basepi-merge-forward-2015.8 
Conflicts:
    salt/utils/event.py
 2015-08-21 16:37:24 -06:00
Erik Johnson
e7099af0f6 Get rid of useless unit tests and add integration test for winrepo 2015-08-21 13:14:42 -05:00
Ivan Babrou
c228088de6 Properly check for ipset ranges, fixes #26453 
This add support for idempotent runs of `ipset.present` state
if ranges are used as entries. IP1-IP2 and IP/MASK variants
are supported.
 2015-08-21 09:42:51 -06:00
Erik Johnson
d2166e95cb Fix formatting 2015-08-21 10:19:36 -05:00
Justin Findlay
4703ac3028 Merge pull request #26535 from bobrik/ipset-ranges 
Properly check for ipset ranges, fixes #26453
 2015-08-21 08:13:01 -06:00
Ageeleshwar Kandavelu
63efe11e4f ini modules test fix 2015-08-21 16:29:30 +05:30
Ageeleshwar Kandavelu
dd48f8ff50 ini_unit test fix 2015-08-21 14:47:13 +05:30
Ivan Babrou
5b82c45746 Properly check for ipset ranges, fixes #26453 
This add support for idempotent runs of `ipset.present` state
if ranges are used as entries. IP1-IP2 and IP/MASK variants
are supported.
 2015-08-21 09:18:54 +01:00
Ageeleshwar Kandavelu
77bc8fcc55 ini lint and formatting fixes 2015-08-21 12:36:11 +05:30
Ageeleshwar Kandavelu
73bfbab452 Merge from upstream 
Merge branch 'develop' of github.com:saltstack/salt into develop
 2015-08-21 08:59:43 +05:30
Colton Myers
ff2d6c6045 Fix git test 2015-08-20 16:23:36 -06:00
Colton Myers
a3fc46da0b py3 compat 2015-08-20 16:23:32 -06:00
Colton Myers
2907a64052 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cli/batch.py
    salt/modules/git.py
    salt/utils/event.py
 2015-08-20 13:31:46 -06:00
Colton Myers
28aa9b1058 Merge pull request #26486 from thusoy/git-confidential-auth 
Git: Don't leak https user/pw to log
 2015-08-20 10:04:52 -06:00
Ageeleshwar Kandavelu
62af0d7f07 Merge from upstream 
Merge branch 'develop' of github.com:saltstack/salt into develop
 2015-08-20 20:06:01 +05:30
Ageeleshwar Kandavelu
b2ec235199 ini cosmetics fix 2015-08-20 20:05:36 +05:30
Tarjei Husøy
5289165487 Git: Don't leak https user/pw to log 2015-08-19 23:58:08 -07:00
Mike Place
a9b28e9577 Merge pull request #26483 from thusoy/git-user-only-auth 
Handle user-only http auth in git module
 2015-08-19 16:47:41 -06:00
Colton Myers
8d450b9acd Remove unused import 2015-08-19 16:38:34 -06:00
Colton Myers
aa3673385d Remove another heavily-mocked test 2015-08-19 16:08:00 -06:00
Colton Myers
2695e3159e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-08-19 15:05:52 -06:00
Jenkins
9d3f0624b4 Lint 2015-08-19 14:36:23 -06:00
Jenkins
5b7389d80e Fix schedule test error on py26 2015-08-19 14:33:38 -06:00
Tarjei Husøy
09fc934acc Handle user-only http auth in git module 2015-08-19 11:46:30 -07:00
Colton Myers
73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cli/daemons.py
    salt/master.py
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/pw_group.py
    salt/utils/http.py
    setup.py
    tests/unit/modules/schedule_test.py
 2015-08-19 11:29:45 -06:00
Colton Myers
f6481a1fb3 Merge pull request #26410 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-18 11:52:13 -06:00
Colton Myers
38f22875e1 Fix schedule test failures 
Includes removal of heavily-mocked test_list and test_reload
 2015-08-18 10:48:01 -06:00
Mike Place
a3b32bbc9e Merge pull request #26413 from evverx/fix-start-restart-reload-and-force-reload 
Fix service.{start,restart,reload,force-reload} for masked services
 2015-08-18 08:16:15 -06:00
Erik Johnson
94941fbed1 Remove git unit tests 
These tests are useless, they assert true results while mocking
cmd.run_all to always return True with retcode 0. Nothing but a waste of
CPU cycles.
 2015-08-17 22:10:33 -05:00
Evgeny Vereshchagin
31ac42cac3 Fix service.{start,restart,reload,force-reload} for masked services 2015-08-18 00:57:52 +00:00
Colton Myers
f3c8ba85dc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/opennebula.py
    salt/modules/systemd.py
    salt/utils/aws.py
 2015-08-17 17:06:59 -06:00
Colton Myers
d3d0e004d9 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/keystone.py
    salt/modules/pw_user.py
    salt/states/reg.py
    setup.py
 2015-08-17 16:54:16 -06:00
Evgeny Vereshchagin
ab4d6e5323 Fix service.enable for masked services 2015-08-17 14:00:20 -06:00
Mike Place
b62b2d6797 Merge pull request #26318 from evverx/enable-masked-services 
Fix service.enable for masked services
 2015-08-17 12:57:43 -06:00
Thomas S Hatch
9d64b419d2 Merge pull request #26272 from garethgreenaway/schedule_list_show_jobs_enabled 
Fixes to schedule module
 2015-08-17 12:54:24 -06:00
Evgeny Vereshchagin
ecb6b7d40f Fix service.enable for masked services 2015-08-14 13:09:20 +00:00
Justin Findlay
7e94989403 mock pwd calls in pw_user exec mod test 
Fixes #26266.
 2015-08-13 13:20:11 -06:00
Gareth J. Greenaway
ac36c3e979 Two more fixes to unit tests reflecting changes. 2015-08-13 10:53:37 -07:00
Gareth J. Greenaway
22ac074f5d Additional changes to ensure unit tests pass. 2015-08-13 08:21:09 -07:00
Gareth J. Greenaway
89576e870f Updating unit tests to reflect changes to schedule module. 2015-08-12 17:44:37 -07:00
Justin Findlay
4cf9a16e63 Merge pull request #26224 from cachedout/fopen_2015_8 
Cleanup of a few cases to move to salt.utils.fopen
 2015-08-12 14:15:49 -06:00
Colton Myers
110cae3cdc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-08-11 18:14:31 -06:00
Mike Place
b5980ca54a Migrate wtmp beacon to fopen 2015-08-11 15:57:04 -06:00
Colton Myers
ee4b788745 Skip tests that require windows libraries if not present 2015-08-10 16:57:06 -06:00
Colton Myers
49fb19049b Remove outdated heavily-mocked unit test 2015-08-10 16:54:17 -06:00
Colton Myers
1b0b21394e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/win_system.py
 2015-08-10 13:27:31 -06:00
Colton Myers
0fc16040d6 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/__init__.py
    salt/cloud/clouds/vmware.py
    salt/loader.py
    salt/minion.py
    salt/modules/archive.py
    salt/modules/file.py
    salt/states/pkg.py
    salt/utils/http.py
 2015-08-10 13:21:57 -06:00
Mike Place
2704094e21 Merge pull request #26125 from evverx/timedatectl-settz 
Use timedatectl set-timezone to tzsetting if available
 2015-08-10 08:43:41 -06:00
Erik Johnson
18ebdd382a Update winrepo tests with new param names 2015-08-09 21:19:45 -05:00
Evgeny Vereshchagin
694ba4d0c6 Check the tzname before the tzfiles hashsums 
Fix #12654, #24964
 2015-08-09 07:24:18 +03:00
Evgeny Vereshchagin
e5eaf4686a Use timedatectl set-timezone to tzsetting 
Fixed #26122
 2015-08-09 06:00:35 +03:00
C. R. Oldham
28329fff55 These tests make no sense now that the proxy interface is module based and not object based. 2015-08-08 14:44:33 -06:00
Corey Quinn
d5cb70360f Fixed to expanded URL 2015-08-06 13:14:39 -07:00
Corey Quinn
e4f78637a0 Updated rvm installer script link as per upstream 2015-08-06 11:47:30 -07:00
Colton Myers
a4d4f8c5f8 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/linode.py
    salt/modules/layman.py
    salt/modules/win_system.py
 2015-08-05 15:30:04 -06:00
twangboy
0502897635 Fixed the lint... again 2015-08-04 17:43:58 -06:00
twangboy
6f85d6b9af Fixed some lint 2015-08-04 17:13:47 -06:00
Justin Findlay
9156bbd33e update win_system exec mod unit tests 2015-08-04 15:55:32 -06:00
Colton Myers
d5fbd960fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/fileserver/s3fs.py
    salt/modules/chocolatey.py
    salt/modules/s3.py
    salt/modules/zpool.py
    salt/pillar/s3.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
 2015-08-03 15:01:35 -06:00
Colton Myers
4d8ba6b874 Remove reg unit tests, not applicable to latest version of reg module 2015-08-03 12:03:03 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Mike Place
fefb4eb79b Merge pull request #25767 from techhat/awskms 
Add AWS KMS support to S3
 2015-07-28 10:00:41 -06:00
Thomas S Hatch
f4a3583595 Merge pull request #25762 from jfindlay/etcd 
Fix #24959 unit tests
 2015-07-28 09:32:24 -06:00
Joseph Hall
37ff73d935 Update tests 2015-07-27 18:56:55 -06:00
Justin Findlay
de344e465c fix etcd_mod unit tests 2015-07-27 14:13:34 -06:00
Justin Findlay
b3bed2d5d2 Merge pull request #25754 from s0undt3ch/develop 
Merge 2015.8 forward to develop
 2015-07-27 13:34:56 -06:00
Thomas S Hatch
6ebc61b0c8 Merge pull request #25734 from Unity-Technologies/wait-after-reboot 
Added a way to wait for a reboot to complete on Windows
 2015-07-27 11:47:03 -06:00
Pedro Algarvio
1010eef5ff Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-27 18:20:50 +01:00
Daniel Hobley
1ad9da30e5 Added a way to wait for a reboot to complete on Windows 
- This is useful if you have many states that are being run in a highstate and you don't want the rest of the states, running just before a reboot as this could lead to half complete states i.e installing software
 2015-07-27 14:16:02 +02:00
Stanislav Blokhin
595da6252e Configurable AWS region & region from IAM metadata 2015-07-24 16:06:20 +02:00
Andreas Lutro
dd2a188c05 fix tests 2015-07-23 15:17:18 +02:00
Colton Myers
2cb1189ff9 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/opennebula.py
    salt/grains/core.py
 2015-07-22 12:17:58 -06:00
Colton Myers
c63ef2c7b2 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/modules/gem.py
    salt/modules/ssh.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/states/pkg.py
    salt/utils/__init__.py
    salt/utils/s3.py
 2015-07-22 12:05:50 -06:00
Erik Johnson
123b8ee1cb Fix mock_open patch 
Forgot to add this when I removed the decorator in my previous commit.
 2015-07-22 11:09:15 -05:00
Erik Johnson
af82835f42 Move patching of mock_open to within test 
This keeps the tests from failing on platforms like RHEL6 where
unittest2 has no mock_open.
 2015-07-22 03:04:07 -05:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
twangboy
5008bfee96 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_21041_again 2015-07-20 12:51:43 -06:00
twangboy
8b2dc681f9 Fixed the gem module to work on windows... without injection 2015-07-20 12:50:33 -06:00
Thomas S Hatch
7a0bb9df1e Merge pull request #25453 from isbm/isbm-libvirt 
Improving libvirt
 2015-07-16 14:26:03 -06:00
Joe Julian
1b7a56aa38 Add support for pyOpenSSL > 0.10 
Centos 6 doesn't provide a packaged version of pyOpenSSL > 0.10. Allow
the tls module to work with that minimum version. This will not allow
X509 extensions to work but will allow everything else.

Fixes #25384
 2015-07-15 16:49:54 -07:00
Ryan Lewis
a8abe21b1b Wildcard support for get_flags_from_package_conf 2015-07-16 08:19:02 +12:00
Bo Maryniuk
a35c84f40b Fix test for "stop" function 2015-07-15 19:03:48 +02:00
Bo Maryniuk
4040c82515 Fix test for "start" function 2015-07-15 19:03:37 +02:00
Bo Maryniuk
fa5163033e Fix test for "list_domains" function 2015-07-15 19:03:18 +02:00
Bo Maryniuk
63202ac3ec Rename 'list_vms' to 'list_domains' for consistent terminology 2015-07-15 13:09:12 +02:00