valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,766 Commits 24 Branches 182 Tags 341 MiB
b463cc0e5b
Commit Graph

24766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
b463cc0e5b Merge pull request #9720 from SaveTheRbtz/verbose-sign-in 
crypt: log sign_in errors
 2014-01-13 09:37:09 -08:00
Thomas S Hatch
cea5cf03c8 Merge pull request #9717 from makinacorpus/fix_ssh 
do not remove not managed keys and fix multiple ssh_auth.present for same user
 2014-01-13 09:36:38 -08:00
Thomas S Hatch
d3bc2341ba Merge pull request #9716 from avdhoot/develop 
Fix for #9715 Reacter process get exited with wrong sls
 2014-01-13 09:18:14 -08:00
Thomas S Hatch
60f6b00370 Merge pull request #9714 from bbinet/docfix 
Doc fix salt.states.file
 2014-01-13 09:17:25 -08:00
Thomas S Hatch
7e4e333053 Merge pull request #9713 from SaveTheRbtz/fix-rekey 
master: publish_session is in seconds, not minutes
 2014-01-13 09:16:32 -08:00
Thomas S Hatch
53f502df1b Merge pull request #9705 from gravyboat/develop 
Updated master conf docs with more options, and reorganized the document.
 2014-01-13 09:15:03 -08:00
Thomas S Hatch
5c9e8cf97a Merge pull request #9704 from bruce-one/use-tarfile-module 
Allow for use of the tarfile Python module in the archive state.
 2014-01-13 09:12:40 -08:00
Pedro Algarvio
b1b338b62b Merge pull request #9712 from SaveTheRbtz/setup-py-shebang 
setup: fixed shebang
 2014-01-13 05:53:11 -08:00
Mathieu Le Marec - Pasquet
25d406a23e do not remove not managed keys 2014-01-13 14:08:36 +01:00
Pedro Algarvio
14b50ee141 Merge pull request #9706 from UtahDave/develop 
on windows, try msgpack_pure if msgpack not available.
 2014-01-13 04:51:14 -08:00
Avdhoot
f1a4ce51f7 Fix for #9715 Reacter process get exited with wrong sls & fixed build failed 2014-01-13 17:00:40 +05:30
Avdhoot
5b49008f7b Fix for #9715 Reacter process get exited with wrong sls 2014-01-13 16:25:35 +05:30
Bruno Binet
82f0b58a02 Docfix: s/symlink/file/ 2014-01-13 10:38:11 +01:00
Alexey Ivanov
368679bd45 master: publish_session is in seconds, not minutes 2014-01-13 01:37:18 -08:00
Alexey Ivanov
62464b237f setup: fixed shebang 2014-01-13 00:58:57 -08:00
Forrest Alvarez
edf3598f12 Updated the salt bootstrap tutorial with an example to download the latest stable release with curl moved the wget example so it is right below the curl example to ensure users get the stable as opposed to the develop on accident. Fixed a weird wording issue, and some line lengths, though several still remain. 2014-01-13 05:37:59 +00:00
Forrest Alvarez
39d9064811 Merge remote branch 'upstream/develop' into develop 2014-01-13 05:31:44 +00:00
Alexey Ivanov
2168334f62 crypt: log sign_in errors 2014-01-12 20:11:35 -08:00
Erik Johnson
b40dc72ff0 Merge pull request #9710 from s0undt3ch/hotfix/lint 
No `{}` in string format calls!
 2014-01-12 16:41:35 -08:00
Pedro Algarvio
41d7844b65 No {} in string format calls! 2014-01-12 21:22:37 +00:00
David Boucha
a23f67ef24 found last instance of import msgpack 2014-01-12 12:46:53 -07:00
David Boucha
2f94f9056d import msgpack_pure if msgpack not available 2014-01-12 12:28:10 -07:00
David Boucha
3bedc16784 catch specific error 2014-01-12 12:27:11 -07:00
David Boucha
5830ee2588 try msgpack_pure if msgpack not available 2014-01-12 12:27:11 -07:00
David Boucha
d791e5deb0 try msgpack_pure if msgpack isnt' available 2014-01-12 12:27:11 -07:00
Pedro Algarvio
e616723aba Merge pull request #9709 from makinacorpus/fix_to 
add socket.timeout to external_ip exceptions catch
 2014-01-12 08:25:37 -08:00
Mathieu Le Marec - Pasquet
5f122e1664 add socket.timeout to external_ip exceptions catch 2014-01-12 12:12:56 +00:00
Thomas S Hatch
6a922d30eb Use correct yaml in examples 2014-01-12 01:10:17 -07:00
Bryce Gibson
98e5138dfb Using a closing context with the with block 2014-01-12 17:53:02 +11:00
Bryce Gibson
0cfb197fea Cleaner tar extraction by using the extractall method 2014-01-12 17:31:51 +11:00
Bryce Gibson
ef08ae4310 Pylint fix 2014-01-12 17:04:14 +11:00
Forrest Alvarez
563f99538d Fixed some errors that were getting generated. 2014-01-12 05:33:04 +00:00
Forrest Alvarez
60b05663de Merge remote branch 'upstream/develop' into develop 2014-01-12 05:23:14 +00:00
Forrest Alvarez
13a7acff03 Updated the master configuration docs to fill out the rest of the items that were missing from the docs, also moved some stuff around so it was in the same order as the actual master conf file. 2014-01-12 05:23:09 +00:00
Bryce Gibson
b7aceae76c Allow for use of the tarfile Python module in the archive state. 2014-01-12 15:13:19 +11:00
Thomas S Hatch
0715f6c29a Lint fix 2014-01-11 20:52:53 -07:00
Thomas S Hatch
b7cabdfe18 Lint fixes 2014-01-11 20:26:47 -07:00
Forrest Alvarez
0f76689b4b Merge remote branch 'upstream/develop' into develop 2014-01-12 03:12:29 +00:00
Thomas S Hatch
830912eaa6 Merge pull request #9702 from terminalmage/docs 
Add note about network.managed availability
 2014-01-11 19:00:59 -08:00
Thomas S Hatch
3995e55f37 Merge pull request #9697 from terminalmage/add-missing-yumpkg-funcs 
Add missing functions from old yumpkg module
 2014-01-11 19:00:46 -08:00
Thomas S Hatch
a9957baf9c Merge pull request #9684 from quantonganh/fixed-archive-state-osx 
archive state: make it work with bsdtar (for e.g: on the Mac OS X)
 2014-01-11 19:00:27 -08:00
Thomas S Hatch
4c12435c7b Merge pull request #9679 from dlanderson/mine_cache_runner 
Add ability to fetch cached mine data in cache.py runner module
 2014-01-11 18:59:36 -08:00
Erik Johnson
b0941af4e9 Add note about network.managed availability 2014-01-11 17:37:58 -06:00
Erik Johnson
757b7756b5 Merge pull request #4 from s0undt3ch/hotfix/add-missing-yumpkg-funcs 
Lint fixes
 2014-01-11 15:18:52 -08:00
Pedro Algarvio
106c44587e Merge pull request #9701 from s0undt3ch/hotfix/ssh-binaries 
Skip the tests if binaries are missing.
 2014-01-11 14:47:14 -08:00
Pedro Algarvio
44bdfee0a3 Merge pull request #9700 from s0undt3ch/hotfix/no-hardcoded-virtualenv-bin 
no hardcoded virtualenv bin
 2014-01-11 14:46:52 -08:00
Pedro Algarvio
af69768470 Merge pull request #9699 from s0undt3ch/develop 
More generic iterable checking.
 2014-01-11 14:46:06 -08:00
Pedro Algarvio
2bb11d24b9 Skip the tests if binaries are missing. 2014-01-11 14:38:17 -07:00
Pedro Algarvio
8268b7b532 Ignore it PyLint!!! 2014-01-11 21:35:18 +00:00
Pedro Algarvio
5642db5032 Simplify the code 2014-01-11 21:20:42 +00:00