Commit Graph

36921 Commits

Author SHA1 Message Date
Pedro Algarvio
46ea34b4f5 Switch open() for salt.utils.fopen() 2014-11-26 17:55:30 +00:00
Pedro Algarvio
32b2f2e05f Switch open() for salt.utils.fopen() 2014-11-26 17:54:29 +00:00
Pedro Algarvio
2127a98667 Switch open() for salt.utils.fopen() 2014-11-26 17:52:46 +00:00
Pedro Algarvio
9230f5b5ee Switch open() for salt.utils.fopen() 2014-11-26 17:50:47 +00:00
Pedro Algarvio
753338e078 Switch open() for salt.utils.fopen() 2014-11-26 17:49:27 +00:00
Pedro Algarvio
2a597da207 Switch open() for salt.utils.fopen() 2014-11-26 17:47:05 +00:00
Pedro Algarvio
6b72255e9b Switch open() for salt.utils.fopen() 2014-11-26 17:46:13 +00:00
Pedro Algarvio
5dfddc88a4 Switch open() for salt.utils.fopen() 2014-11-26 17:39:49 +00:00
Pedro Algarvio
0723b24feb Switch open() for salt.utils.fopen() 2014-11-26 17:39:18 +00:00
Thomas S Hatch
1c76db6c4d Merge pull request #18499 from whiteinge/runner-sync-eventlisten
Start listening for events when RunnerClient is instantiated
2014-11-25 20:54:44 -07:00
Seth House
c03288a3c9 Start listening for events when RunnerClient is instantiated
If we're not listening to the eventstream before starting a new job
there's a high likelyhood that we'll miss the job return event. This
change mimics the event-based runners addition slated for Boron.
2014-11-25 16:39:47 -07:00
Seth House
5c08ba4324 Merge pull request #18494 from rallytime/cleanup_doc_build
Clean up doc build so it doesn't stacktrace
2014-11-25 15:56:29 -07:00
rallytime
73f3c0091d Clean up doc build so it doesn't stacktrace
Fixes #18471

- Add zmq.eventloop to mocked modules in doc/conf.py
- Cleaned up rst references in rest_tornado.rst
2014-11-25 15:11:15 -07:00
Thomas S Hatch
876b8ca0b1 Merge pull request #18491 from jfindlay/quote_genesis
quote strs in genesis mod
2014-11-25 14:50:13 -07:00
Thomas S Hatch
965a68dc24 Merge pull request #18489 from rallytime/cleanup_tornado_tests
Skip tornado tests if we can't import ZMQIOLoop
2014-11-25 14:48:59 -07:00
Thomas S Hatch
2e44c6b26a Merge pull request #18486 from jfindlay/quote_parted
validate block devices in parted mod
2014-11-25 14:48:29 -07:00
Thomas S Hatch
592a65c8f0 Merge pull request #18485 from cachedout/mysql_no_log
Do not log
2014-11-25 14:47:37 -07:00
Thomas S Hatch
d0b17de50e Merge pull request #18484 from garethgreenaway/scheduler_fixes
Fixes to scheduler in 2014.7
2014-11-25 14:46:32 -07:00
Justin Findlay
d0d2f3fdad quote strs in genesis mod 2014-11-25 13:48:04 -07:00
rallytime
eeab98c3be Skip tornado tests if we can't import ZMQIOLoop
Tornado tests were failing on Ubuntu 10 and 12 because they don't have
a new enough version of PyZMQ to use the ioloop.current function.
2014-11-25 13:06:33 -07:00
Justin Findlay
dfc44cce4e validate block devices in parted mod 2014-11-25 12:35:03 -07:00
Mike Place
a3ef002d2a Do not log 2014-11-25 12:32:45 -07:00
Gareth J. Greenaway
ed0211bc23 Adding some fixes to the schedule when splay is specified but the seconds option is not. Also allowing splay start and end flags to be equal to lock down splay to a specific number of seconds. 2014-11-25 11:28:50 -08:00
David Boucha
45cf5b9bfb Merge pull request #18473 from fastmarkets/2014.7
Fix bug #18129 in win_service.status.
2014-11-25 10:32:59 -07:00
Thomas S Hatch
ccaaa9fd51 Merge pull request #18467 from rallytime/remove_encoding_arg
Remove encoding kwarg from ustring
2014-11-25 09:36:26 -07:00
Thomas S Hatch
93ddc68b9a Merge pull request #18454 from rallytime/cmd_unittests
Started some unit tests for the cmdmod.py module
2014-11-25 09:35:40 -07:00
Thomas S Hatch
31d8043644 Merge pull request #18450 from jfindlay/quote_apt
quote input in aptpkg mod
2014-11-25 09:34:50 -07:00
Thomas S Hatch
10964ed165 Merge pull request #18449 from cachedout/require_name_in_file_state
Friendly message if name arg is none/false
2014-11-25 09:34:28 -07:00
Mike Place
9e6572fc51 Merge pull request #18452 from cachedout/issue_18380
Pass loglevel in zcbuildout
2014-11-25 09:33:49 -07:00
Thomas S Hatch
456c4d68da Merge pull request #18446 from basepi/filemanagecontentsstring
Force contents to a string in file.managed
2014-11-25 09:16:16 -07:00
Thomas S Hatch
9bfc40cd21 Merge pull request #18442 from jfindlay/quote_rbenv
quote input in rbenv mod
2014-11-25 09:11:19 -07:00
John Carlyle-Clarke
202d17c6cc Fix bug in win_service.status. Make all sc calls use list2cmdline for constistency. 2014-11-25 15:33:11 +00:00
rallytime
b943a3e1d7 Remove encoding kwarg from ustring
Fixes #18458, Refs #18374
2014-11-24 21:05:33 -07:00
Nicole Thomas
4d12e8faff Merge pull request #18464 from rallytime/pylinting
Fix OrderedDict import in runners/lxc.py
2014-11-24 20:35:21 -07:00
rallytime
0909269c62 Fix OrderedDict import in runners/lxc.py 2014-11-24 19:48:43 -07:00
rallytime
dc3c8f91bd Pylint fix 2014-11-24 19:44:54 -07:00
rallytime
792433f915 Started some unit tests for the cmdmod.py module 2014-11-24 17:03:52 -07:00
Mike Place
d33983209e Pass loglevel in zcbuildout
Closes #18380
2014-11-24 16:34:03 -07:00
Mike Place
51b866f7f6 Friendly message if name arg is none/false
Closes #18432
2014-11-24 16:00:52 -07:00
Justin Findlay
68fa2ab5ee quote input in aptpkg mod 2014-11-24 15:49:21 -07:00
Colton Myers
2402d10407 Force contents to a string in file.managed 2014-11-24 15:46:52 -07:00
Justin Findlay
98c581385e pylint fix for quote rbenv mod 2014-11-24 15:32:53 -07:00
Pedro Algarvio
817a0a4f8b Merge pull request #18439 from rallytime/jenkins_argparse
Jenkins argparse
2014-11-24 22:13:35 +00:00
Colton Myers
0bea194481 Merge pull request #18443 from basepi/issue-12483-docs
Add warning to docs about topfile compilation
2014-11-24 14:36:53 -07:00
Colton Myers
42223567b8 Add warning to docs about topfile compilation
Ref #12483
2014-11-24 14:33:37 -07:00
Justin Findlay
a9f5eeec42 quote input in rbenv mod 2014-11-24 14:29:50 -07:00
rallytime
022d2dbbfb Remove unused import 2014-11-24 13:02:08 -07:00
rallytime
512f07303a Put the parser variable in the correct place 2014-11-24 12:13:38 -07:00
Thomas S Hatch
0f6e314abc Merge pull request #18438 from thatch45/odict_clense
Fix #18428
2014-11-24 12:01:04 -07:00
Thomas S Hatch
4fc90e8a1f Fix #18428 2014-11-24 12:00:31 -07:00