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
45,951 Commits 24 Branches 182 Tags 341 MiB
79be964dc2
Commit Graph

1704 Commits

Author SHA1 Message Date
Pedro Algarvio
79be964dc2 We need to write something, even an empty string 2015-01-30 22:25:19 +00:00
Pedro Algarvio
e6ab1d4ba1 Fix import 2015-01-30 22:25:19 +00:00
Pedro Algarvio
fdd2a3e246 Correct the iteration 2015-01-30 22:25:19 +00:00
Pedro Algarvio
403abc88e1 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
91d185153c Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
5d570561fd Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
665127c932 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
fda912f2d8 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
7360164558 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
fcd9832863 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
ec93519312 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
f07427a0ed Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
b54c02930f Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
8fa37d65eb Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
cb6531293c Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
b555ddf658 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
b791dd6971 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
81ae50fac0 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
eca6f730db Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
207f3ddbf1 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
4ae7e918e9 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
f5928068b3 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
3624b911b3 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
3f24dcfa80 Import six at a later stage 2015-01-30 22:25:07 +00:00
Pedro Algarvio
fdc467b587 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
a4e48e8873 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
2d8b216bcd Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
f59d669a58 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
4eadb88bfa Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
0bc44131e8 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
0577610258 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
dd146ca3e5 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
5bc0c157b6 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
rallytime
9898fcf613 Merge branch '2015.2' into 'develop' 
Conflicts:
	.gitignore
	.pylintrc
	.testing.pylintrc
	salt/client/mixins.py
	salt/cloud/clouds/msazure.py
	salt/config.py
	salt/modules/mount.py
	salt/runners/doc.py
	salt/utils/event.py
	salt/utils/reactor.py
 2015-01-29 17:24:04 -07:00
rallytime
c65d9673a7 Merge branch '2014.7' into merge_forward_fifteen_second_try 
Conflicts:
	salt/states/file.py
 2015-01-29 13:42:49 -07:00
Thomas Jackson
3d1ae49d09 Pass opts not an ImmutableDict of opts 2015-01-28 18:43:45 -08:00
Thomas Jackson
645027c0fe cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix" 
This reverts most of commit 745f2d84835ae23800358cd4dcc9c8525b502714.

apparently I picked up some other changes I didn't mean to

Conflicts:
	salt/utils/event.py
	tests/integration/utils/test_reactor.py
 2015-01-28 18:43:43 -08:00
Thomas Jackson
5bfef71240 Pylint fix 2015-01-28 18:43:43 -08:00
Thomas Jackson
d8e8de2a19 Caste jid as str (its an int all over), and change runner tag to correct prefix 
Conflicts:

	salt/utils/event.py
 2015-01-28 18:43:40 -08:00
Mike Place
7c066c38a0 Increae default runner timeout to 60s 2015-01-28 13:56:41 -07:00
Thomas Jackson
4db02487f1 Pass opts not an ImmutableDict of opts 2015-01-27 13:11:01 -08:00
rallytime
dc23823897 Merge branch '2014.7' into '2015.2' 
Conflicts:
	salt/modules/localemod.py
 2015-01-27 13:24:14 -07:00
Thomas S Hatch
bf397d12b3 Merge pull request #20094 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-01-27 10:04:51 -07:00
Colton Myers
c4da7bdd64 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/client/mixins.py
	salt/daemons/flo/__init__.py
 2015-01-26 19:44:59 -07:00
Mike Place
0b38efaaad Increae default runner timeout to 60s 2015-01-26 10:59:55 -07:00
rallytime
299374a211 Change image name in rackspace profile config to a valid one 2015-01-24 20:14:23 -07:00
Pedro Algarvio
a6c3915049 Fix order for proper diff on failure 2015-01-24 03:16:51 +00:00
Mike Place
09d3d62174 Loosen test constraint and update runas arg 2015-01-24 03:16:50 +00:00
Mike Place
e7d959b6a5 Even MORE test fixing 2015-01-24 03:16:50 +00:00