Pedro Algarvio
|
40a64191a1
|
Absolute imports and A LOT of code cleanup.
|
2017-03-01 01:33:07 +00:00 |
|
Pedro Algarvio
|
3beb3fb801
|
Move whatever we need from salttesting to salt.
Let's drop the salttesting dependency cycle.
|
2017-02-28 22:52:49 +00:00 |
|
Pedro Algarvio
|
15af4c9728
|
Test filenames conformity. Adjust for pytest.
|
2017-02-23 23:19:42 +00:00 |
|
rallytime
|
30f14d15df
|
Merge branch '2016.3' into '2016.11'
Conflicts:
- salt/config/__init__.py
- salt/engines/slack.py
|
2017-01-04 16:54:58 -05:00 |
|
Jonathan Ballet
|
2e7f743371
|
yaml: support unicode serialization/deserialization
Fix: #30454
|
2017-01-04 13:29:28 +01:00 |
|
rallytime
|
c2b52ccf9c
|
Merge branch '2016.3' into 'develop'
Conflicts:
- salt/states/ipset.py
|
2016-06-24 16:03:11 -06:00 |
|
rallytime
|
ae8ad9329c
|
Merge branch '2015.8' into '2016.3'
Conflicts:
- salt/renderers/gpg.py
- tests/unit/renderers/gpg_test.py
|
2016-06-24 14:45:37 -06:00 |
|
rallytime
|
d7a5e9b10e
|
Remove test that doesn't actually test anything
|
2016-06-24 09:10:13 -06:00 |
|
Dmitry Kuzmenko
|
17b03e9d8b
|
Allow to blacklist/whitelist renderers. (#33358)
* Allow to blacklist/whitelist renderers.
* Fix tests.
* Unit test for renderer blacklisting.
* Minor tests fixes
|
2016-05-20 10:41:51 -07:00 |
|
Justin Findlay
|
992a8af726
|
renderers.gpg unit tests: mock gpg command
|
2016-03-10 10:57:21 -07:00 |
|
Justin Findlay
|
5ce61abf57
|
rewrite GPG unit tests
|
2015-11-16 09:36:29 -07:00 |
|
Justin Findlay
|
40889d7d7e
|
rewrite GPG unit tests
|
2015-07-16 09:37:37 -06:00 |
|
Aneesh Agrawal
|
4b9311507c
|
Add new module type for serializers from issue #22257.
Move existing serializers from salt.utils.serializers to
salt.serializers.
|
2015-05-28 20:03:11 -04: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 |
|
Pedro Algarvio
|
51dba5c24b
|
Use Salt's OrderedDict which always exists
|
2015-04-26 10:51:28 +01:00 |
|
Pedro Algarvio
|
0651c06ec0
|
Fix import
|
2015-04-10 00:04:17 +01:00 |
|
Pedro Algarvio
|
60f215f191
|
Add from __future__ import absolute_import
|
2015-01-30 22:25:04 +00:00 |
|
Mike Place
|
e3bf4bb6ee
|
GPG test fix
Now with 100% fewer race conditions
|
2015-01-26 14:12:35 -07:00 |
|
Pedro Algarvio
|
41870ef3e0
|
Fix ensure in syspath call
|
2014-10-12 02:16:23 +01:00 |
|
Pedro Algarvio
|
4fca1c96da
|
Set the cachedir to a relative path
|
2014-10-12 02:16:23 +01:00 |
|
Mike Place
|
7b9c313773
|
Check for gpg binary
|
2014-07-08 10:16:05 -06:00 |
|
Mike Place
|
44a06ef7f0
|
Fix gpg test
|
2014-07-07 15:26:27 -06:00 |
|
Pedro Algarvio
|
0564fc363e
|
A more generic directory name
|
2014-06-10 03:25:14 +01:00 |
|
Pedro Algarvio
|
9bd6d330ec
|
Change to an existing directory before importing keyring
|
2014-06-10 01:52:53 +01:00 |
|
Pedro Algarvio
|
9d208eaf76
|
Use an explicit path for the keydir not getcwd
|
2014-06-10 01:52:53 +01:00 |
|
Pedro Algarvio
|
a7b7f18e6f
|
Double to single quotes
|
2014-06-06 12:24:10 +01:00 |
|
Pedro Algarvio
|
7e11871d9f
|
Ensure correct syspath
|
2014-06-01 06:55:52 +01:00 |
|
Thomas S Hatch
|
b8897a5b0d
|
rename the sls renderer to the yamlex renderer
|
2014-05-30 09:28:20 -06:00 |
|
Thomas S Hatch
|
185eae31cd
|
Merge branch 'serializers-migration' of https://github.com/johnnoone/salt into johnnoone-serializers-migration
Conflicts:
salt/pillar/__init__.py
|
2014-05-30 09:16:21 -06:00 |
|
rallytime
|
0042169b7c
|
Created renderers directory in salt/tests/unit for gpg_test.py
|
2014-05-12 13:21:26 -06:00 |
|
Xavier Barbosa
|
ce2cf98518
|
implements sls renderer
|
2014-04-09 06:45:10 +02:00 |
|