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
53,518 Commits 24 Branches 182 Tags 341 MiB
5f8f24b655
Commit Graph

304 Commits

Author SHA1 Message Date
Thomas S Hatch
d951bc8ad4 Merge pull request #22548 from terminalmage/docker-ng 
Add docker-ng state module
 2015-05-15 12:09:58 -06:00
Erik Johnson
150d4e25c7 Update unit.utils.utils_test.UtilsTestCase.test_clean_kwargs 
This reflects the new behavior in which all dunder kwargs are cleaned
 2015-05-15 11:17:28 -05:00
Thomas S Hatch
6f1e03f3ce Merge pull request #23388 from jfindlay/salt_url 
salt:// URL escaping
 2015-05-05 21:44:00 -06:00
Thomas S Hatch
a7e417cfd9 Merge pull request #23348 from msteed/remove-m2crypto 
Remove m2crypto
 2015-05-05 16:15:22 -06:00
Justin Findlay
0d514eda7d add salt:// url (un)escaping methods 2015-05-05 15:19:50 -06:00
Michael Steed
c7ad84c8ae egad, lint 2015-05-05 12:21:06 -06:00
Justin Findlay
336a48eca8 add salt.utils.url unit tests 2015-05-04 23:24:45 -06:00
Michael Steed
82c67f744d add unit tests and fix a bug 2015-05-04 15:11:51 -06:00
Matthew Williams
bd40be4b02 Merge branch 'develop' into boto_dicts 2015-04-25 18:29:13 +00:00
Gareth J. Greenaway
58bce28f14 fixing various things that caused unit tests to fail. updating unit tests based on code changes 2015-04-22 21:30:58 -07:00
Matthew Williams
759b522a65 Revert "utils.boto: add temporary ability to use without loader" 
This reverts commit 8d3556ebcd.
 2015-04-17 00:59:11 +00:00
Matthew Williams
8d3556ebcd utils.boto: add temporary ability to use without loader 2015-04-16 23:04:18 +00:00
Matthew Williams
9ecf4f38a6 utils.boto: convert BotoExecutionError back to func 2015-04-15 08:30:40 +00:00
Matthew Williams
46bde83216 Merge remote-tracking branch 'origin/develop' into boto_utils 
Conflicts:
	salt/modules/boto_ec2.py
 2015-04-14 20:07:57 +00:00
Thomas Jackson
435fc7ba61 Add some support pyzmq 13.0.x 
pyzmq 13.0.x was the first version to support *any* tornado in pyzmq, and since 14.0.x they have changed the API (IMO into a more sensible one). This conditionally changes the name to match the new API's naming
 2015-04-13 17:43:45 -07:00
Matthew Williams
b8ead7ab27 utils.boto get_exception -> class 2015-04-13 22:34:19 +00:00
Matthew Williams
45b118f93a Merge remote-tracking branch 'origin/develop' into boto_utils 2015-04-13 15:43:01 +00:00
Matthew Williams
b3ec570499 utils.boto: add convenience partials 2015-04-13 15:42:32 +00:00
Mike Place
6a11ead5b4 Merge pull request #22453 from jacksontj/transport 
Abstracted Transport
 2015-04-13 09:38:52 -06:00
Matthew Williams
4976f863f9 utils.boto unit test -- use utf-8 encoding 2015-04-08 19:39:55 +00:00
Thomas Jackson
ce850a3e33 pylint cleanup 2015-04-08 08:20:17 -07:00
Matthew Williams
d642b5bc89 utils.boto: fix missing import and add regression test 2015-04-08 15:12:15 +00:00
Matthew Williams
28f3e5d0ad utils.boto: add get_exception 2015-04-08 14:46:28 +00:00
Thomas Jackson
f5e2650227 Add basic tests for asyncEventpublisher 2015-04-07 21:01:43 -07:00
Matthew Williams
e22292220a tests for utils.boto 2015-04-08 03:59:51 +00:00
jfindlay
396e8a5938 Merge pull request #20779 from cachedout/issue_20647 
Use declared yaml options
 2015-03-12 12:03:15 -06:00
Justin Findlay
fd829a95ff compare OrderedDicts in serializer unit test 2015-03-12 10:47:34 -06:00
Pedro Algarvio
62f868a076 Merge branch '2015.2' into develop 2015-02-27 10:02:47 +00:00
Pedro Algarvio
a24ae29ee9 Revert "We no longer warn." 
This reverts commit 5d35f856ac.
 2015-02-26 09:41:22 +00:00
Mike Place
26b3ec0be3 Context cache decorator 2015-02-23 19:27:27 -07:00
Colton Myers
f00465a8a1 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/event/index.rst
	salt/loader.py
	salt/modules/config.py
	salt/modules/cyg.py
	salt/modules/hg.py
	salt/modules/lxc.py
	salt/modules/upstart.py
	salt/states/hg.py
	salt/utils/cloud.py
	salt/utils/dictupdate.py
	salt/utils/schedule.py
	tests/integration/fileserver/gitfs_test.py
	tests/unit/pydsl_test.py
 2015-02-18 11:55:29 -07:00
Colton Myers
b2a80b195e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-12 11:44:57 -07:00
Thomas S Hatch
9e054f3890 Merge pull request #20616 from rallytime/merge-20419 
Merge #20419 with test syntax fix
 2015-02-12 10:38:53 -07:00
rallytime
6b2d64b557 Fix second pylint error that popped up 2015-02-11 22:07:37 -07:00
rallytime
789570fb94 Fix pylint/syntax of test in which_test to merge #20419 2015-02-11 21:48:34 -07:00
Hung Nguyen Viet
d10ce3ade2 fix unittest for windows 2015-02-12 01:37:40 +07:00
Arnold Bechtoldt
9de6c1d839 improve test tests/unit/utils/validate_net_test.py useability 2015-02-09 11:52:08 +01:00
Arnold Bechtoldt
50ecfef1db do call class methods correctly 2015-02-09 09:45:12 +01:00
Arnold Bechtoldt
2c5f5f8bf7 fix pep8 lint checks, refs #20508 2015-02-09 09:14:38 +01:00
Arnold Bechtoldt
ef7834db76 fix broken ipv6 address verification in salt.utils.validate.net 2015-02-08 23:48:05 +01:00
rallytime
db612d0b81 Clean up some pylint on 2015.2 
This way PRs against 2015.2 will be a little happier
 2015-02-06 07:58:26 -07:00
rallytime
02d3235cf2 Fix remaining pylint errors on develop 2015-02-04 21:11:17 -07:00
Pedro Algarvio
482016eea3 Py3 compatibility 2015-01-30 22:27:05 +00:00
Pedro Algarvio
72654ad0a9 Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
85b66a47c5 Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
a8ff8fa0b5 Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
8081170d8d Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
0ead7d0f9b Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
c3d922bdc4 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
53a5f4beb8 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00