valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,776 Commits 24 Branches 182 Tags 341 MiB
a02ad59941
Commit Graph

8776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
acc5c18ee0 Merge pull request #2860 from s0undt3ch/develop 
Don't assume digits in logging format strings. Refs #2859, fixes #2853.
 2012-12-11 04:49:44 -08:00
Pedro Algarvio
cc776247e2 Remove and extra ) left behind by me. Minor PEP-8. 2012-12-11 12:23:13 +00:00
Pedro Algarvio
8c2cadcc13 Mimic some logging handler attributes and methods. 2012-12-11 12:18:48 +00:00
Pedro Algarvio
13c5719940 Keep logging information when __virtual__() changes the module name. 
This addresses the fix on saltstack/salt@3fa8b42e3a which introduced a bug, and saltstack/salt@9dbd90a3e6 which fixed the bug. A win-win situation :)
 2012-12-11 11:40:07 +00:00
Pedro Algarvio
64a0d631e1 Fix rvm unit tests. 2012-12-11 11:27:21 +00:00
Denis Generalov
ffc6f1783a pep8 fix 2012-12-11 15:16:32 +04:00
Pedro Algarvio
7c5a5d0bd3 Header updates. More copyright to the SaltSatck team. Code author to me(where applicable). 2012-12-11 10:23:37 +00:00
Pedro Algarvio
8d092afddc Don't assume digits in logging format strings. Refs #2859, fixes #2853. 
Sorry @ryanschneider for stepping in on your fix.

Nothing is assumed now, and several checks are made. If any of the checks fail, nothing else is done in `salt.log.Logging.__new__()`.
Added a test case which will take care of possible regressions on this bug fix.
 2012-12-11 10:10:03 +00:00
Pedro Algarvio
6c9aef7c90 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-12-11 08:43:33 +00:00
Thomas S Hatch
a704410cbc Merge pull request #2859 from ryanschneider/log-fix 
Fix exception in log.py.
 2012-12-10 19:26:42 -08:00
Ryan Schneider
f06597844b Explicit check for None as digits could be 0. 2012-12-10 18:32:42 -08:00
Ryan Schneider
9b3607c56c Fix exception in log.py. 2012-12-10 18:25:58 -08:00
Thomas S Hatch
010bd92f6b States should not produce side effects 
Fix #2709
 2012-12-10 18:14:11 -07:00
Thomas S Hatch
e9bc59ac70 Fixes to rvm module 
Single Quotes!!!
Also change the runas decision to use config.option
 2012-12-10 18:10:50 -07:00
Thomas S Hatch
85d6d584a5 Add docs to the master for state_output and state_verbose 
Fix #2857
 2012-12-10 17:39:21 -07:00
Thomas S Hatch
ee0158ebe2 Add state_output option docs 2012-12-10 17:37:42 -07:00
Thomas S Hatch
9dbd90a3e6 Fix issue where virtual modules with the same name as the module 
Were not being loaded
 2012-12-10 17:19:47 -07:00
Thomas S Hatch
9564ac1629 Add a poller timeout to fix network flooding 2012-12-10 16:56:39 -07:00
Thomas S Hatch
ff48ddb7ad Merge pull request #2858 from giantlock/develop 
avoid extra iteration
 2012-12-10 15:52:21 -08:00
Thomas S Hatch
646ddda673 Add master_ext_job cache to master defaults 2012-12-10 16:44:46 -07:00
Denis Generalov
72b708dad1 avoid extra iteration 2012-12-11 02:25:50 +04:00
Thomas S Hatch
7952a8a1df Fix pformat error 2012-12-10 14:25:53 -07:00
Thomas S Hatch
a77b9c0f46 Clean out some more merge conflicts 2012-12-10 14:13:47 -07:00
Thomas S Hatch
82a08cb73d Merge pull request #2854 from archtaku/develop 
add back try/except
 2012-12-10 13:00:54 -08:00
Thomas S Hatch
a2d64f4728 Not working as expected in further tests 2012-12-10 13:58:58 -07:00
Erik Johnson
4cbe670a61 add back try/except 2012-12-10 14:56:46 -06:00
Thomas S Hatch
f5dcab9594 doh! Miliseconds! 2012-12-10 13:50:27 -07:00
Thomas S Hatch
57c78695a9 Add show_top function to state module, Fix #2723 2012-12-10 13:45:30 -07:00
Thomas S Hatch
0f57e084b2 Merge branch 'develop' of git://github.com/archtaku/salt into archtaku-develop 
Conflicts:
	salt/modules/pacman.py
	salt/modules/pkg_resource.py
 2012-12-10 13:25:56 -07:00
Erik Johnson
868aa1b221 Roll back multiple-version support 2012-12-10 13:45:57 -06:00
Thomas S Hatch
ae4a988a78 Fix #2654 2012-12-10 12:10:30 -07:00
Thomas S Hatch
52ce466f6b Fix consistancy error for salt-call -g 2012-12-10 11:45:39 -07:00
Bernd Nigmann
b3657d05ce Added __is_file_ignored() evaluation to __find_file() and _file_list_emptydirs() 2012-12-10 13:42:33 -05:00
Thomas S Hatch
e9d14a478a print grains with grains outputter with salt-call -g 2012-12-10 11:35:08 -07:00
Thomas S Hatch
4cdc6708f3 Set the grains to use the new grains outputter 2012-12-10 09:35:26 -07:00
Thomas S Hatch
914c80bd31 Add outputter specific to grains 2012-12-10 09:34:55 -07:00
Thomas S Hatch
81c0b81959 Merge pull request #2850 from rrada/develop 
Alternatives state/module changes
 2012-12-10 07:13:53 -08:00
Radek Rada
b47d8d910e changes from latest upstream/develop branch 2012-12-10 16:01:05 +01:00
Radek Rada
89aa9a1892 alternatives vs. update-alternatives 
- added stuff to handle these differences on Debian and RedHat base
  distros
 2012-12-10 15:49:35 +01:00
Thomas S Hatch
990880e183 Merge pull request #2848 from SEJeff/use-isinstance-ftw 
cleanup: use isinstance() instead of type(foo) == type(bar)
 2012-12-10 06:28:55 -08:00
Thomas S Hatch
ee630c0d1f Merge pull request #2846 from unicolet/pullrequests/saltkey/events 
Add event firing code for delete and delete_all key management operations
 2012-12-10 06:14:20 -08:00
Thomas S Hatch
ef1f58cbbc Merge pull request #2845 from robinsmidsrod/apt-confdef 
Add option to apt-get calls to update unmodified config files
 2012-12-10 06:12:15 -08:00
Pedro Algarvio
aa9830696d Spaces for tabs. 2012-12-10 14:08:21 +00:00
Pedro Algarvio
c3abd0a775 Switch tabs to spaces. 2012-12-10 13:51:55 +00:00
Pedro Algarvio
3431ffb784 Fix salt/modules/alternatives.py, __salt__ is not available at __virtual__ stage. 
* Since when `__virtual__()` is called, `__salt__` is not yet defined, we cannot use `__salt__['cmd.has_exec']`. Import `salt.utils.which` and use that, it's the same.
* Switch double quotes for single quotes.
* PEP-8
 2012-12-10 12:19:27 +00:00
Erik Johnson
f222cc02ad remove pkg arch from list_pkgs output 2012-12-09 22:34:13 -06:00
Bernd Nigmann
2844772071 file_ignore, second iteration 2012-12-09 22:58:04 -05:00
Erik Johnson
32b476594a Add multiple version support for FreeBSD 2012-12-09 21:05:26 -06:00
Erik Johnson
141481c97c Add multiple version support to ebuild 2012-12-09 20:56:32 -06:00
Erik Johnson
0645921f34 Add multiple version support to apt 2012-12-09 20:53:05 -06:00