Commit Graph

42699 Commits

Author SHA1 Message Date
Pedro Algarvio
14cc8931ed Disable some Pylint errors 2014-11-28 15:30:05 +00:00
Pedro Algarvio
761ba6c68c Disable some Pylint errors 2014-11-28 15:29:38 +00:00
Pedro Algarvio
8319680fff Disable some Pylint errors 2014-11-28 15:28:36 +00:00
Pedro Algarvio
db9541f2d5 Disable some Pylint errors 2014-11-28 15:28:11 +00:00
Pedro Algarvio
6b7af5dfc7 Disable some Pylint errors 2014-11-28 15:27:41 +00:00
Pedro Algarvio
c038184ca7 Disable some Pylint errors 2014-11-28 15:26:47 +00:00
Pedro Algarvio
0c9da726f5 Switch open() for salt.utils.fopen() 2014-11-27 21:16:35 +00:00
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
95ef828346 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-11-27 03:57:49 +00:00
Nicole Thomas
968ec62b20 Merge pull request #18525 from s0undt3ch/2014.7
Switch `open()` for `salt.utils.fopen()`
2014-11-26 19:40:38 -07:00
Thomas S Hatch
bb53bc3901 Merge pull request #18532 from cro/nssm32bit_20147
Upgrade nssm but switch back to 32 bit
2014-11-26 18:45:24 -07:00
Thomas S Hatch
99b76a1782 Merge pull request #18537 from garethgreenaway/scheduler_run_on_start
Additions to scheduler.
2014-11-26 18:42:55 -07:00
Thomas S Hatch
c085a23761 Merge pull request #18539 from wt/fix_s3fs_2014.7_exception
Handle errors while unpickling.
2014-11-26 18:41:25 -07:00
Thomas S Hatch
082c82309d Merge pull request #18529 from thatch45/event_cleaning
use event factory functions
2014-11-26 18:39:26 -07:00
Pedro Algarvio
33ee04d835 Switch open() for salt.utils.fopen() 2014-11-26 23:44:16 +00:00
Pedro Algarvio
3c31fce736 Switch open() for salt.utils.fopen() 2014-11-26 23:40:43 +00:00
Pedro Algarvio
f28d134d36 Switch open() for salt.utils.fopen() 2014-11-26 23:39:47 +00:00
Pedro Algarvio
78bc5107ee Switch open() for salt.utils.fopen() 2014-11-26 23:38:34 +00:00
Pedro Algarvio
62ec46d6dd Switch open() for salt.utils.fopen() 2014-11-26 23:37:01 +00:00
Pedro Algarvio
d957d2e911 Switch open() for salt.utils.fopen() 2014-11-26 23:36:26 +00:00
Pedro Algarvio
bea345e720 Switch open() for salt.utils.fopen() 2014-11-26 23:35:31 +00:00
Pedro Algarvio
1857a0d31f Switch open() for salt.utils.fopen() 2014-11-26 23:30:18 +00:00
Seth House
75ef72b7fb Merge pull request #18523 from saltstack/revert-18148-six_docs_build
Revert "[don't merge!!] Add six dependency notice to building docs intru...
2014-11-26 16:19:42 -07:00
Warren Turkal
18a5851d9d Handle errors while unpickling.
The metadata cache for s3 can get corrupted. If unpickling raises such
an error we should just refetch the data from s3.
2014-11-26 15:16:36 -08:00
Seth House
4ee5fcbcca Merge pull request #18536 from tjyang/develop
Adding 4 smallerpdf files beside one giant 1600+ pages Salt-all.pdf
2014-11-26 16:14:23 -07:00
Pedro Algarvio
8735242906 We need to call read()! 2014-11-26 23:13:19 +00:00
Gareth J. Greenaway
75ed48bc6e Adding the ability to not have a scheduled job run when the minion first starts up. 2014-11-26 14:56:37 -08:00
T.J. Yang
a6535cf37d makefile update at Wed Nov 26 16:21:18 CST 2014 2014-11-26 16:21:18 -06:00
Pedro Algarvio
b8b4158377 Remove unused import 2014-11-26 21:52:30 +00:00
Pedro Algarvio
aaf0f4aba0 Fix imports 2014-11-26 21:08:13 +00:00
Pedro Algarvio
1eeb02d93f Add a missed with 2014-11-26 21:07:39 +00:00
Pedro Algarvio
47edf6fc89 Fix the with context 2014-11-26 20:49:04 +00:00
C. R. Oldham
f41cc45a8f Switch nssm back to 32-bit 2014-11-26 13:35:53 -07:00
Pedro Algarvio
bd7f23ac6f Switch open() for salt.utils.fopen() 2014-11-26 20:30:13 +00:00
Pedro Algarvio
1c65fa2db4 Switch open() for salt.utils.fopen() 2014-11-26 20:27:51 +00:00
Pedro Algarvio
89778fd9dd Switch open() for salt.utils.fopen() 2014-11-26 20:26:44 +00:00
Pedro Algarvio
643d66070a Switch open() for salt.utils.fopen() 2014-11-26 20:25:40 +00:00
Pedro Algarvio
acd615d486 Switch open() for salt.utils.fopen() 2014-11-26 20:24:40 +00:00
Pedro Algarvio
1ec10692de Switch open() for salt.utils.fopen() 2014-11-26 20:23:59 +00:00
Pedro Algarvio
316c1ad80b Switch open() for salt.utils.fopen() 2014-11-26 20:23:16 +00:00
Pedro Algarvio
a32818870c Switch open() for salt.utils.fopen() 2014-11-26 20:22:38 +00:00
Pedro Algarvio
7fcd8af68c Switch open() for salt.utils.fopen() 2014-11-26 20:21:41 +00:00
Pedro Algarvio
c72a0a9dff Dos 2 unix line breaks. Switch open() for salt.utils.fopen() 2014-11-26 20:20:47 +00:00
Thomas S Hatch
8db80b774e use event factory functions 2014-11-26 13:16:17 -07: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
491d251f48 Fix invalid syntax 2014-11-26 19:57:32 +00:00
Pedro Algarvio
d3f419ca84 Fix undefined variable 2014-11-26 19:56:24 +00:00
Pedro Algarvio
edb1687d19 Switch open() for salt.utils.fopen() 2014-11-26 19:34:55 +00:00
Pedro Algarvio
71bc0b754e Switch open() for salt.utils.fopen() 2014-11-26 19:32:45 +00:00
Nicole Thomas
e1157d13be Revert "[don't merge!!] Add six dependency notice to building docs intructions" 2014-11-26 12:23:13 -07:00