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
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
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
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
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
Kris Raney
8ab4938f48
Pylint fixes
2016-01-13 11:11:26 -06: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
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
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
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
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
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
Joe Julian
01a8e7ee10
Convert glusterfs module to use xml
...
The gluster cli has the option to produce xml output from most every
command, and to avoid pausing for questions when being run in script
mode. Make use of that capability and avoid scraping text output that is
often subject to change between versions.
This should help future-proof this module as any changes to the xml
output should be automatically integrated.
As part of this change, I added a glusterfs.info function and added the
force keywords to volume start and volume stop.
Fixes #30051
2016-01-04 09:47:59 -08:00
Kris Raney
08987a1698
Fix new lint warning
2015-12-30 22:43:38 -06:00
Kris Raney
26ded33d79
Reproduced the no-boto problem and fixed it.
2015-12-30 22:08:35 -06:00
Kris Raney
1fb44b0925
Try again to deal with missing boto
2015-12-30 20:46:01 -06:00
Kris Raney
ee052615d1
Fix case when boto is not present
2015-12-30 16:34:58 -06:00
Mike Place
d09e69f3fc
Merge pull request #30057 from abednarik/virtual_ret_parted_module
...
modules.parted: __virtual__ return err msg.
2015-12-30 08:57:55 -07:00
rallytime
c386d70742
Merge branch '2015.8' into 'develop'
...
Conflicts:
- salt/modules/alternatives.py
- salt/modules/boto_rds.py
- salt/modules/mount.py
- salt/states/boto_iam.py
2015-12-29 15:51:12 -07:00
rallytime
f7e58a241c
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- salt/modules/boto_vpc.py
- tests/unit/modules/boto_vpc_test.py
2015-12-29 15:27:03 -07:00
abednarik
c1be5a61fa
modules.parted: __virtual__ return err msg.
...
Updated message when module is not supported based on systems or available binaries.
2015-12-29 16:55:48 -03:00
Mike Place
e915f4b591
Merge pull request #30053 from akissa/add-postgres-privileges-support
...
Add postgres privileges support
2015-12-29 09:50:44 -07:00
Andrew Colin Kissa
efcfb611b2
added postgres execution privileges tests
2015-12-29 10:59:48 +02:00
rallytime
1a83147986
Remove unnecessary import block
2015-12-28 16:14:13 -07:00
rallytime
695107ae6e
Add some more unit tests for the vsphere execution module
...
And fix a coupl of small bugs found in the module through testing
2015-12-28 16:11:33 -07:00
Mike Place
5cfda08b39
Merge pull request #29970 from sjorge/module-zfs
...
salt.modules.zfs
2015-12-28 14:38:37 -07:00
Kris Raney
3dea1a3589
Sometimes 'no whitespace after comma' actually means 'no whitespace after _colon_'.
2015-12-28 15:14:27 -06:00
Kris Raney
2fe5d8fbb4
Fix pylint errors
2015-12-28 14:46:43 -06:00
Jorge Schrauwen
4bad71c60d
lint fixes
2015-12-28 19:48:51 +00:00
Kris Raney
85d59865a6
Merge branch 'develop' into boto_iot
2015-12-28 13:45:35 -06:00
Stephen D. Spencer
e0da7cddf6
modules.pip:
...
adjust (actual) current directory bits
tests.unit.modules.pip_test:
adjust mock's expectations of cwd=None always being passed (?)
2015-12-28 09:37:39 +00:00
justinta89
e706642152
Skipping some Boto tests until resolved moto issue
...
Similar to #29725 . Though, some of the tests are different, due to the older
branch. I'm not condisidering this a backport because of that.
2015-12-27 22:34:09 -07:00