Commit Graph

3572 Commits

Author SHA1 Message Date
twangboy
1c58318013 Fixed tests 2016-01-22 17:32:42 -07:00
Andrew Colin Kissa
82a966b1f4 Add postgres_initdb state module tests 2016-01-22 12:16:51 +02:00
Andrew Colin Kissa
f5aa107583 Add tests for data directory init and existance check 2016-01-22 12:15:45 +02:00
Colton Myers
cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    doc/ref/configuration/master.rst
    doc/topics/cloud/linode.rst
    salt/cloud/clouds/linode.py
    salt/modules/rh_ip.py
    salt/renderers/pyobjects.py
    salt/states/file.py
2016-01-21 17:42:50 -07:00
Mike Place
40ba550ffd Merge pull request #30511 from kraney/boto_s3_bucket
Boto s3 bucket state
2016-01-21 15:52:58 -07:00
Erik Johnson
ea0ca70187 Add git.list_worktrees unit test 2016-01-21 15:42:30 -06:00
Kris Raney
16e8b4f9e3 cut-and-paste error 2016-01-21 13:23:52 -06:00
Mike Place
0f5baa65ea Fix missing key in opts for event tests 2016-01-21 11:06:03 -07:00
Kris Raney
14f7bf693b Pylint fixes 2016-01-21 11:37:43 -06:00
Kris Raney
4ad20f6217 Not satisfied with the code complexity/ readability/ maintainability, so refactor a bit. Fix a couple bugs in the process. Add unit tests. 2016-01-21 11:28:53 -06:00
Kris Raney
917f48d19f Implement unit tests for boto_s3_bucket module 2016-01-21 11:25:55 -06:00
Evan Borgstrom
e148ea2d52 Allow recursive salt:// imports
Fixes #30465
2016-01-20 11:29:00 -08:00
Evan Borgstrom
6bbac64d3a Add test to prove that recursive imports are currently broken
Refs #30465

This also exposes some other issues with the Registry being in an
inconsistent state when an exception occurs when we are rendering.
2016-01-20 11:22:51 -08:00
Mike Place
7b88d721a5 Merge pull request #30368 from lyft/boto_dynamodb
Update boto_dynamodb module and state
2016-01-20 11:23:15 -07:00
Zack Hsi
fbff36df36 Fix unit test 2016-01-19 16:06:07 -08:00
Sean Jenkins
e44a30620b Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead 2016-01-19 15:06:30 -07:00
justinta89
00943ff1e6 Boto uses False for is_default instead of None 2016-01-19 10:15:35 -07:00
rallytime
39b49621ad Merge branch '2015.8' into 'develop'
Conflicts:
  - salt/beacons/service.py
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/modules/ipset.py
  - salt/modules/npm.py
  - salt/modules/rpm.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/schedule.py
  - tests/unit/modules/state_test.py
2016-01-14 13:33:53 -07:00
Mike Place
d5b8776355 Merge pull request #30340 from jtand/seed_test_fix
Updated seed_test.py for changes made to seed module
2016-01-13 15:50:34 -07:00
Mike Place
c5d1365a36 Merge pull request #30331 from alprs/feature-patch_dir
Make file.patch work with directories
2016-01-13 14:34:58 -07:00
Mike Place
09b144aa98 Merge pull request #30327 from kraney/boto_cloudtrail
Support for AWS CloudTrail
2016-01-13 13:18:06 -07:00
Andreas Lutro
b73ee448f0 fix command args list 2016-01-13 20:59:10 +01:00
Mike Place
10b5728f84 Merge pull request #30308 from rallytime/bp-30257
Back-port #30257 to 2015.8
2016-01-13 12:20:13 -07:00
justinta89
ee764ee952 Updated seed_test.py for changes made to seed module 2016-01-13 11:58:05 -07:00
Andreas Lutro
d8b499b7c5 Make file.patch work with directories
In the process, make the "hash" argument optional.

Closes #29619
2016-01-13 19:15:21 +01:00
Mike Place
ded14dcead Merge pull request #30263 from kiorky/mysql
fix quoting
2016-01-13 10:48:20 -07:00
Mike Place
dcfba51556 Lint 2016-01-13 10:42:03 -07:00
Mike Place
b9921128af Kill pointless tests 2016-01-13 10:15:26 -07:00
Kris Raney
8ab4938f48 Pylint fixes 2016-01-13 11:11:26 -06:00
Mike Place
63c157d0a3 Fix test_managed 2016-01-13 09:54:33 -07:00
Kris Raney
d30212f180 Add tag support to boto_cloudtrail 2016-01-13 10:13:05 -06:00
Mathieu Le Marec - Pasquet
22963e50f8 fix mysql tests 2016-01-13 10:12:53 +01:00
abednarik
deeeb71dda Add test in npm state.
Updated nmp module to append --dry-run when executing nmp state in test mode.

Fixes #30250.
2016-01-12 14:30:32 -07:00
Kris Raney
6fa7c84ec2 Initial cloud trail state support 2016-01-12 15:20:24 -06:00
Kris Raney
549d0b8d8b Module functionality for support of state module 2016-01-12 15:19:31 -06:00
Jacob Hammons
53d17f1f85 Changed examples to use the "example.com" domain instead of "mycompany.com" or "company.com" 2016-01-12 13:37:09 -07:00
Kris Raney
0d211a4fd5 Basic CloudTrail module 2016-01-12 13:13:19 -06:00
Mike Place
2c62b464b1 Accept whatever comes into hightstate mock for state tests 2016-01-12 11:30:25 -07:00
Mike Place
11d27ba694 Mock config module in utils test 2016-01-11 16:31:21 -07:00
Mike Place
cf440036dd Remove unused import 2016-01-11 14:14:50 -07:00
Mike Place
36d55ea0ad Allow modules to be packed into boto utils
A workaround to allow modules to be packed into the namespace for the boto utils.
2016-01-11 14:13:07 -07:00
abednarik
128ded881f Add test in npm state.
Updated nmp module to append --dry-run when executing nmp state in test mode.

Fixes #30250.
2016-01-11 17:05:12 -03:00
Mike Place
70681bf03b Fix for mock state PR #30118 2016-01-06 15:10:19 -07:00
Mike Place
3dd4d05a4b Merge pull request #30185 from cachedout/fix_30118
Fix #30118
2016-01-06 14:02:56 -07:00
Mike Place
180582a523 Fix for mock state PR #30118 2016-01-06 14:01:43 -07:00
Colton Myers
f476c75fad Merge pull request #30062 from seanjnkns/develop
Remove recurse_list from pillar_source_merging_strategy and add pilla…
2016-01-06 10:27:35 -07:00
Colton Myers
8bc5506c08 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    doc/topics/installation/rhel.rst
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/win_update.py
    salt/states/boto_elb.py
    salt/states/file.py
2016-01-05 16:19:32 -07:00
Mike Place
9ef4bb3b46 Merge pull request #30132 from akissa/add-support-for-custom-augeas-lense-paths
Add support for augeas loading of non stock lenses
2016-01-04 13:36:07 -07:00
Mike Place
5419699bd2 Merge pull request #30075 from iodatacenters/2015.8_gluster_usexml
Convert glusterfs module to use xml
2016-01-04 13:33:58 -07:00
Mike Place
fff6bf1970 Merge pull request #30041 from kraney/boto_iot
Support for AWS IoT
2016-01-04 13:04:06 -07:00