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
53,054 Commits 24 Branches 182 Tags 341 MiB
7d8038f134
Commit Graph

1329 Commits

Author SHA1 Message Date
Colton Myers
7d8038f134 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    debian/changelog
    salt/modules/win_pkg.py
    salt/pillar/__init__.py
    salt/states/file.py
 2015-05-14 10:27:00 -06:00
Justin Findlay
e480f13688 Merge pull request #23675 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-05-13 12:35:54 -06:00
Colton Myers
5ee7f25ee4 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-13 11:50:33 -06:00
Colton Myers
acdd3fc6bd Fix lint 2015-05-13 11:47:43 -06:00
Jayesh Kariya
17987d97f0 made changes to test_interfaces function. 2015-05-13 10:35:05 -06:00
Jayesh Kariya
6e05148962 adding solr unit test case 2015-05-13 17:14:53 +05:30
Jayesh Kariya
0936e1d386 made changes to test_interfaces function. 2015-05-13 11:09:40 +05:30
Colton Myers
eca368a0ee Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-12 16:09:12 -06:00
Colton Myers
680e88f058 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    salt/modules/ebuild.py
    tests/unit/modules/grains_test.py
 2015-05-12 16:06:36 -06:00
Nicole Thomas
cbe32828ef Merge pull request #23580 from jayeshka/smf-unit-test 
adding smf unit test case
 2015-05-12 10:29:58 -06:00
Daniel Hobley
30d8be877d Lint fixes 2015-05-12 15:48:53 +02:00
Daniel Hobley
899ba78e79 Added power cfg module and state for windows minions 
- Allows you to set power settings on a windows minion for things like the monitor and disk
 2015-05-12 14:49:48 +02:00
Jayesh Kariya
4f9719157b adding smf unit test case 2015-05-12 18:06:49 +05:30
Colton Myers
9b2f27b87f Remove unused mock_open 2015-05-11 15:52:24 -06:00
Colton Myers
3c51d36599 Remove tests.unit.modules.seed_test.test_mkconfig 
Was creating False.pem and False.pub files, and wasn't compatible with
new crypt.py changes. Should be rewritten as a proper, destructive,
integration test.
 2015-05-11 15:11:58 -06:00
Christophe Drevet-Droguet
ebff9df5b2 fix pylint errors 2015-05-11 21:21:10 +02:00
Justin Findlay
e9b94d36d3 additional mock for rh_ip_test test_build_bond 
Fixes #23473.
 2015-05-11 12:31:24 -06:00
Colton Myers
1d77ae9072 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/modules/hipchat.py
    salt/modules/random_org.py
    salt/modules/serverdensity_device.py
    salt/modules/slack_notify.py
    salt/returners/__init__.py
    salt/states/iptables.py
 2015-05-11 11:38:03 -06:00
salt_build
b3f284c517 Fixed tests 2015-05-11 15:49:19 +00:00
Jayesh Kariya
3ad5314ee0 adding service unit test case 2015-05-11 18:01:10 +05:30
Christophe Drevet-Droguet
c4954046ad unit tests for grains.append module function 
- separate test functions for every return
- add tests for nested lists
- add test for appending to an element of a list (fails silently)
 2015-05-10 17:27:32 +02:00
Christophe Drevet-Droguet
0c9a32326c use MagickMock 2015-05-09 18:34:02 +02:00
Christophe Drevet-Droguet
c838a22377 unit tests for grains.append module function 2015-05-08 21:01:36 +02:00
Justin Findlay
604857811e Merge pull request #23495 from jayeshka/seed-unit-test 
adding seed unit test case
 2015-05-08 11:30:38 -06:00
Jayesh Kariya
1fb48a31a8 adding sensors unit test case 2015-05-08 16:11:20 +05:30
Jayesh Kariya
3f134bc573 adding seed unit test case 2015-05-08 16:10:00 +05:30
Colton Myers
e6905b4073 Delete the win_useradd tests 2015-05-07 23:46:51 -06:00
Justin Findlay
865127844a Merge pull request #23450 from jayeshka/scsi-unit-test 
adding scsi unit test case
 2015-05-07 13:00:28 -06:00
Colton Myers
ce9064dc74 No arguments to list_users 2015-05-07 09:54:57 -06:00
Jayesh Kariya
e7269ff29b adding scsi unit test case 2015-05-07 15:44:39 +05:30
Jayesh Kariya
85786bfe7f adding s3 unit test case 2015-05-07 15:43:32 +05:30
Colton Myers
ece63c36a3 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/ssh/roster.rst
    salt/modules/win_groupadd.py
 2015-05-06 15:49:50 -06:00
Jayesh Kariya
a4dd836125 adding rsync unit test case 2015-05-06 17:31:04 +05:30
Colton Myers
2981aed48e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-05-05 16:49:31 -06:00
Jayesh Kariya
f9da6db459 adding riak unit test case 2015-05-05 15:39:52 +05:30
Justin Findlay
11d893db19 explicitly quote requirements filename 2015-05-04 23:24:46 -06:00
Thomas S Hatch
e23e4f6ef8 Merge pull request #23309 from rmcleay/secgroup_egress 
Egress rule support for boto_secgroup
 2015-05-04 14:57:02 -06:00
Tarjei Husøy
64f661d2cc Add missing jump arguments to iptables module 
I think this is all the arguments supported.

Also adds test for no-arg options and adds some docs on no-arg.

Point to discuss:
 - The --save option crashes with our defined --save option. Probably
   no rush since no one's complained so far, but this should be fixed.
   Maybe we can rename this one to connsecmark-save, since it only appears
   as an option to the CONNSECMARK jump target? Maybe also rename restore
   to connsecmark-restore too, for consistency, even though restore
   doesn't collide with anything?
 2015-05-04 13:19:23 +02:00
Robert McLeay
57067a3c0f Fixing linting in boto_secgroup module and unit test. 2015-05-04 15:45:26 +10:00
Robert McLeay
c2695986fe Added rules_egress to boto_secgroup unit test. 2015-05-04 15:45:25 +10:00
Ronald van Zantvoort
d814b7f9a3 Better unit test fix, add 2 unit tests for IPv6 2015-05-01 20:29:25 +02:00
Ronald van Zantvoort
d81fbc4bc3 Unit test fix 2015-05-01 19:34:08 +02:00
Thomas S Hatch
4fabf465ff Merge pull request #23174 from jfindlay/locale_utils 
move locale utils to separate module
 2015-04-30 08:22:00 -07:00
Justin Findlay
f46db2c8cb move locale specifier utilities to utils/locales 2015-04-29 16:00:45 -06:00
Colton Myers
cca8ddc886 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    .testing.pylintrc
    salt/auth/pam.py
    salt/modules/win_status.py
    salt/utils/network.py
    salt/utils/schedule.py
    tests/unit/renderers/gpg_test.py
    tests/unit/states/boto_secgroup.py
 2015-04-29 12:01:52 -06:00
Yoshito Komatsu
42ef698790 Fix typos 2015-04-29 21:40:31 +09:00
Yoshito Komatsu
1bda5365dd Fix tests 2015-04-29 21:37:59 +09:00
Jayesh Kariya
636c654205 adding rh_ip unit test case 2015-04-29 17:29:37 +05:30
Mike Place
373586576d Merge pull request #23062 from mgwilliams/boto_dicts 
return dicts from all boto_vpc functions
 2015-04-28 14:25:59 -06:00
Kevin Boulain
a9777c6167 fix tests for the parted module 2015-04-28 13:22:54 -06:00