Commit Graph

31 Commits

Author SHA1 Message Date
Colton Myers
dc43840cee Merge branch '2014.7' into merge-forward
Conflicts:
	salt/modules/glusterfs.py
	salt/modules/macports.py
	salt/modules/makeconf.py
	salt/modules/mdadm.py
	salt/modules/smartos_vmadm.py
	salt/modules/zypper.py
	salt/utils/event.py
	tests/integration/netapi/rest_tornado/test_app.py
	tests/unit/netapi/rest_tornado/test_handlers.py
2014-11-21 12:05:32 -07:00
Mike Place
6b0e9c4e29 Provide nbopen poller default and increase interval in jenkins 2014-11-19 12:30:00 -07:00
Chris Rebert
b9bb56841d fix numerous typos+misspellings 2014-11-05 13:57:47 -08:00
Colton Myers
8dca840248 Remove unused imports 2014-10-03 13:25:04 -06:00
Colton Myers
0edf446903 Remove unused imports 2014-10-02 13:52:24 -06:00
Tarjei Husøy (via Travis CI)
25ea6060b7 Replace random.randint() with os.urandom() 2014-10-02 10:20:20 -06:00
Tarjei Husøy (via Travis CI)
ea06fb21cb Replace random.randint() with os.urandom() 2014-10-02 15:21:26 +02:00
Pedro Algarvio
69e9f14f39 Cleanup header 2014-06-17 09:57:23 +01:00
Pedro Algarvio
2809d68e11 Allow passing which transport to use when testing 2014-06-17 09:56:05 +01:00
Pedro Algarvio
107ca41d9b LXC requires a deployment host 2014-06-17 09:56:04 +01:00
Pedro Algarvio
1d465f4af7 Double quote YAML 2014-06-17 09:56:04 +01:00
Pedro Algarvio
3226a08ea1 peer needs arg as a YAML string 2014-06-17 09:56:04 +01:00
Pedro Algarvio
ec1c278168 Reset cloud to False if LXC is chosen 2014-06-17 09:56:04 +01:00
Pedro Algarvio
9ecc03b018 Drop SSH runtests execution but keep SCP file copying. 2014-06-17 09:56:04 +01:00
Pedro Algarvio
97ae4aa19c Error on SSH use 2014-06-17 09:56:04 +01:00
Pedro Algarvio
ec486bfd1b Force fake tty's and explicit exits! 2014-06-17 09:56:03 +01:00
Pedro Algarvio
b3a4553bcb Fix unit tests XML files download 2014-06-17 09:56:03 +01:00
Pedro Algarvio
f1b5ed761a Minor reordering 2014-06-17 09:56:03 +01:00
Pedro Algarvio
10643602c4 Allow matching tagged versions 2014-06-17 09:56:03 +01:00
Pedro Algarvio
3edb0cbfde Don't forget the python executable 2014-06-17 09:56:03 +01:00
Pedro Algarvio
d4890d314a Allow download and clean up commands to be executed without a deployment 2014-06-17 09:56:03 +01:00
Pedro Algarvio
8cbefb3391 Download remote logs 2014-06-17 09:56:03 +01:00
Pedro Algarvio
6e1e4ce902 Remove double command 2014-06-17 09:56:03 +01:00
Pedro Algarvio
8d1b081f74 Force a TTY when running the tests suite using SSH. 2014-06-17 09:56:02 +01:00
Pedro Algarvio
46bf37e009 First 7 chars not last 7 chars 2014-06-17 09:56:02 +01:00
Pedro Algarvio
58c1b5ce90 Use HEREDOCS when using SSH to send commands 2014-06-17 09:56:02 +01:00
Pedro Algarvio
517b0a096e We can only concatenate lists, not list + tuple 2014-06-17 09:56:02 +01:00
Pedro Algarvio
54a21b14b5 All requiring the TTY flag to be optionally set 2014-06-17 09:56:02 +01:00
Pedro Algarvio
f4ba754fbe Concatenate the command string 2014-06-17 09:56:02 +01:00
Pedro Algarvio
9afc0abf8d Simplify SSH and SCP options passing 2014-06-17 09:56:01 +01:00
Pedro Algarvio
51340886f1 Typo, sync minion, and use the pub key. 2014-06-17 09:56:01 +01:00