valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
71,300 Commits 24 Branches 182 Tags 341 MiB
dbb5724f40
Commit Graph

71300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pablo Suárez Hernández
5c06e91417 pylint: some fixes 2016-07-12 12:24:04 +01:00
Duncan Mac-Vicar P
1e2f14ffcc improve error handling to be more consistent 2016-07-12 13:19:54 +02:00
Pablo Suárez Hernández
39e8ff0f25 pylint fixes 2016-07-12 11:03:09 +01:00
Pablo Suárez Hernández
a89749c329 Fix for _get_jid_snapshots if snapshots doesn't exist 2016-07-12 10:40:25 +01:00
Pablo Suárez Hernández
1d8b2a06a6 load snapper state only if snapper module is loaded 2016-07-12 09:18:28 +01:00
Pablo Suárez Hernández
0a9dbfc33a unit test for snapper.diff with binary file 2016-07-12 09:02:31 +01:00
rallytime
d640a6975b cmp() function is deprecated in Python 3 - use an alternate comparison 2016-07-11 16:16:09 -06:00
rallytime
9f5e275f2e When writing strings to tmp files, use bytes for Python 3 2016-07-11 16:07:35 -06:00
rallytime
fa4da65817 Use six.iteritems(object) in boto_lambda module and state 2016-07-11 16:06:06 -06:00
rallytime
47eafaad08 Remove unused import 2016-07-11 15:42:20 -06:00
rallytime
d30870e8df Use args[0] for error messages in Python 3 
BaseException.message was deprecated in Python 2.6. In Python 3,
this association has been completely removed.
 2016-07-11 15:35:57 -06:00
rallytime
10c2b081c5 Hashlib names are unicode objects in Python 3: Encode it 2016-07-11 20:42:10 +00:00
rallytime
16619d115b Don't use deprecated string.split() reference 
Use str.split() instead. string.split() stacktraces in Python 3.
 2016-07-11 20:41:25 +00:00
Justin Anderson
b2616833b0 Some small changes 2016-07-11 14:35:25 -06:00
rallytime
46035c71cc Use six.iteritems(object) in boto_apigateway module 2016-07-11 14:26:06 -06:00
rallytime
aef7f08463 Use six.iteritems(object) in boto_cloudtrail state and module 2016-07-11 14:26:06 -06:00
rallytime
640d8bb5b2 Pylint fixes 2016-07-11 14:26:06 -06:00
rallytime
4ccba49646 Remove object.iteritems() call from boto_elasticsearch state and module 2016-07-11 14:26:06 -06:00
rallytime
de93203bf5 Remove object.iteritems() call from boto_elasticsearch_domain_test 
Also, clean up imports in that file and remove stray ` character from
boto_apigateway state from previous commit.
 2016-07-11 14:26:06 -06:00
rallytime
2a5dab3c56 Use six.iteritems(object) in boto_s3_bucket module and boto_s3_bucket_test 2016-07-11 14:26:06 -06:00
rallytime
1f21dfc555 Fix unit.states.kmod_test to pass when running in Py3 
The join function adds each list item in different orders, resulting
in a failing state comment comparison. This is inaccurate behavior.
 2016-07-11 14:26:06 -06:00
rallytime
6b7a305a1b Rename dockerio.py unit tests to dockerio_test.py 
These tests have never run automatically because of an incorrect file name.

Added a skipIf on these tests as they are currently non-functioning and the
module they're testing has been deprecated.
 2016-07-11 14:26:06 -06:00
rallytime
09ff0f7ca1 Use six.iteritems(object) instead of object.iteritems() in ini_manage state 2016-07-11 14:26:06 -06:00
rallytime
a77ba45e7e Use six.iteritems(object) instead of object.iteritems() in boto_vpc module 2016-07-11 14:26:06 -06:00
rallytime
4b52a089fe Use six.iteritems(object) instead of object.iteritems() in boto_vpc state 2016-07-11 14:26:06 -06:00
rallytime
3992472fb2 User six.iteritems(object) instead of object.iteritems() in boto_elb state 2016-07-11 14:26:06 -06:00
rallytime
f72f7ef21b User six.iteritems(object) instead of object.iteritems() in boto_asg state 2016-07-11 14:26:06 -06:00
rallytime
538fd7f3ca User six.iteritems(object) instead of object.iteritems() in boto_apigateway state 2016-07-11 14:26:06 -06:00
rallytime
e6f875cd62 Remove izip import from unit.modules.boto_apigateway_test.py 
Use six compatible version of zip instead
 2016-07-11 14:26:06 -06:00
Mike Place
81d5a7a8db Gate vbox reload (#34588) 
* Gate vbox reload

* Lower log level
 2016-07-11 15:47:04 -04:00
Nicole Thomas
d8c8b4ac6f Merge pull request #34553 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-11 15:36:26 -04:00
Mike Place
e94ab2034c Merge pull request #34589 from cachedout/unit_archive_fixup 
Fixup unit test for archive module
 2016-07-11 11:59:34 -06:00
Mike Place
a733b844be Fixup unit test for archive module 2016-07-11 11:59:00 -06:00
Pablo Suárez Hernández
f77de97d48 passing *args and **kwargs to function when snapper.run 2016-07-11 17:02:07 +01:00
Pablo Suárez Hernández
964d5cbf03 fix diff unit test while creating text file 2016-07-11 16:15:11 +01:00
Pablo Suárez Hernández
06ef54a258 Fix for snapper.diff when files are created or deleted 2016-07-11 16:05:23 +01:00
Pablo Suarez Hernandez
f77551b883 more unit tests 2016-07-11 16:47:49 +02:00
Mike Place
6cdaa0ea5f Merge pull request #34564 from techhat/azureip 
Improve public IP address resolution
 2016-07-11 08:21:06 -06:00
Mike Place
2f168a9e56 Merge pull request #34568 from sjorge/vmadm-runner 
introducing salt.runner.vmadm
 2016-07-11 08:03:29 -06:00
Mike Place
5b002e11b4 Merge pull request #34569 from eliasp/2016.3-postgres-doc 
Minor doc fixes for PostgreSQL states
 2016-07-11 08:02:12 -06:00
Mike Place
8a89d8dd3f Merge pull request #34570 from sjorge/apcups-module 
salt.module.apcups
 2016-07-11 08:00:47 -06:00
Mike Place
701f4d13ab Merge pull request #34572 from ajacoutot/openbsd-archive 
archive.extracted: unbreak on OpenBSD
 2016-07-11 07:58:31 -06:00
Mike Place
4a4149d72a Merge pull request #34573 from cedwards/patch-2 
Update freebsd.rst
 2016-07-11 07:57:46 -06:00
Christer Edwards
220a3ae53f Update freebsd.rst 
Updated FreeBSD installation instructions to remove ``priority`` definition. 
(This, I believe, should address an issue submitted in saltstack/salt-bootstrap/issues/908)
 2016-07-10 10:22:30 -06:00
Antoine Jacoutot
c43bd8fabe archive.extracted: unbreak on OpenBSD 
On OpenBSD, using tar in "legacy" mode, all option flags except for -C and -I
must be contained within the first argument to tar and must not be prefixed by a
hyphen. Since the state automatically adds '-f', we are not running in legacy
mode and as such, all options must be prefixed by a hyphen.

* before
[INFO    ] Executing command ['tar', 'xz', '-f', '/path/to/file.tgz'] in directory '/path/to/extractdir'
[ERROR   ] Command '['tar', 'xz', '-f', '/path/to/file.tgz']' failed with return code: 1
[ERROR   ] stderr: tar: Failed open to read on /dev/rst0: Device not configured
<snip>
Failed:    1

* after
[INFO    ] Executing command ['tar', '-xz', '-f', '/path/to/file.tgz'] in directory '/path/to/extractdir'
<snip>
Succeeded: 1 (changed=1)
 2016-07-10 10:43:08 +02:00
Jorge Schrauwen
b3e2f35465 salt.module.apcups - very simple wrapper for apcupsd\s apcstatus command 2016-07-09 16:52:53 +02:00
Elias Probst
221da29ef5
Typo (defaul → default) 2016-07-09 16:02:38 +02:00
Elias Probst
ba3d7c624b
Add code formatting 2016-07-09 16:02:29 +02:00
Elias Probst
b3409c97a2
Fix typo (seens → seen) 2016-07-09 16:02:16 +02:00
Jorge Schrauwen
5f7faa4098 salt.runner.vmadm 2016-07-09 10:56:51 +02:00