Pedro Algarvio
|
733b31da23
|
Merge branch '2014.7' into develop
Conflicts:
tests/unit/modules/hashutil_test.py
tests/unit/templates/jinja_test.py
|
2014-11-27 03:59:40 +00:00 |
|
Pedro Algarvio
|
d957d2e911
|
Switch open() for salt.utils.fopen()
|
2014-11-26 23:36:26 +00:00 |
|
Pedro Algarvio
|
bfe99dbb3f
|
Merge branch '2014.7' into develop
Conflicts:
salt/cloud/__init__.py
salt/modules/file.py
salt/modules/zcbuildout.py
salt/runners/lxc.py
salt/runners/manage.py
|
2014-11-26 20:14:56 +00:00 |
|
Pedro Algarvio
|
46ea34b4f5
|
Switch open() for salt.utils.fopen()
|
2014-11-26 17:55:30 +00:00 |
|
steverweber
|
bf8f936fa4
|
fix issues with keepalive minion
|
2014-07-25 15:13:05 -04:00 |
|
Pedro Algarvio
|
4d7ca91424
|
Remove unnecessary :license: from file headers
|
2014-05-26 19:26:15 +01:00 |
|
Pedro Algarvio
|
1c399660a9
|
Provide a path which should fail.
|
2014-01-20 13:12:57 +00:00 |
|
Pedro Algarvio
|
a9429d8b18
|
Fix unit test expected results since we now exit with an error code.
|
2014-01-19 16:16:49 +00:00 |
|
Pedro Algarvio
|
db670d1357
|
Don't fail if process already killed.
|
2013-10-16 23:27:19 +01:00 |
|
Pedro Algarvio
|
e72b4a3492
|
Fix syslog logic checks for file://, tcp:// and udp://. Fixes #7754.
|
2013-10-15 22:09:37 +01:00 |
|
Pedro Algarvio
|
e18ba0758b
|
Don't include authorship in generated documentation, the Sphinx way.
|
2013-09-16 17:24:00 +01:00 |
|
Pedro Algarvio
|
331dc6d936
|
Updated integration.shell.minion test suite to use salttesting.helpers.ensure_in_syspath()
|
2013-06-28 00:13:02 +01:00 |
|
Pedro Algarvio
|
e772f0d8b6
|
Re-use salt-testing mixin.
|
2013-06-28 00:12:58 +01:00 |
|
Pedro Algarvio
|
663f54ef9f
|
Update copyright years of changed files. Added __main__ execution to tests/integration/states/pip.py.
|
2013-06-28 00:12:57 +01:00 |
|
Pedro Algarvio
|
222be7b446
|
Make sure every test module is runnable by __main__.
* Double to single quotes
|
2013-06-28 00:12:56 +01:00 |
|
Pedro Algarvio
|
7c5a5d0bd3
|
Header updates. More copyright to the SaltSatck team. Code author to me(where applicable).
|
2012-12-11 10:23:37 +00:00 |
|
Pedro Algarvio
|
d776705e49
|
Parsers(master, minion, syndic) cleanup code.
Moved the minion, master and syndic parsers to use mixins to clean up, reuse, and automate some of the required procedures.
|
2012-08-04 19:58:32 +01:00 |
|