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

35613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
80a8844e2a Fix lint issue since arguments differ on purpose 2014-08-10 03:47:34 +01:00
Pedro Algarvio
9ebe6f3873 Test exc_info per handler 2014-08-10 03:44:53 +01:00
Pedro Algarvio
d552200df3 Use default formatter if none is defined 2014-08-10 03:18:34 +01:00
Pedro Algarvio
bbef61525e Allow the inclusion of exc_info on a per handler basis. 
This allows showing the `exc_info` if a specific log level or lower is
enabled, but, on a per logging handler basis.
For example, if the console hander is at info level and the file log
handler is on debug level and we pass `exc_info_on_loglevel` to a log
call, the traceback will be included in the log message of the file
handler but not on the log message of the console handler.

Closes #14870
Closes #14859
 2014-08-10 02:34:41 +01:00
Erik Johnson
dcdf114824 Merge branch '2014.7' into develop 2014-08-09 17:12:12 -05:00
Erik Johnson
a42c536138 Merge pull request #14871 from hemebond/2014.7 
Fix example code block in grains.filter_by
 2014-08-09 17:11:22 -05:00
Joseph Hall
ff16094961 Merge pull request #14877 from whiteinge/doc-mine-function-aliases 
Documented the mine_function alises
 2014-08-09 12:59:11 -06:00
Seth House
05022c6adb Documented the mine_function alises 
Closes #14738
 2014-08-09 11:14:25 -06:00
Pedro Algarvio
d177d99148 Merge branch 'hotfix/transifex-updates' into develop 2014-08-09 15:33:04 +01:00
Pedro Algarvio
4bc8936afa Merge pull request #14874 from s0undt3ch/hotfix/transifex-updates 
Update 'doc/.tx/config' - Build #139
 2014-08-09 15:31:29 +01:00
Pedro Algarvio
b2dbfbfce0 Update 'doc/.tx/config' - Build #139 
http://cookingwithsalt.org/job/salt/job/transifex/139/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-08-09 15:30:36 +01:00
Thomas S Hatch
deb1e2ce12 Merge pull request #14867 from thatch45/clinta-FreeBSD-jail-jls 
Merge #14821 with fixes
 2014-08-08 22:16:57 -06:00
Tom Atkinson
6da493b7e8 Support static option in batch mode 2014-08-09 05:51:38 +02:00
James O'Neill
79db57f08f Fix example code block in grains.filter_by 2014-08-09 13:41:40 +12:00
Thomas S Hatch
ec5b167497 Merge pull request #14864 from rallytime/git_config 
Change git module config docs to match ordering
 2014-08-08 17:18:11 -06:00
Thomas S Hatch
c5580e6f81 Merge pull request #14852 from cachedout/tty_move 
Call subprocess directly
 2014-08-08 16:30:06 -06:00
Thomas S Hatch
3d7e1a625c Merge pull request #14845 from 7oku/develop 
fixed bug if there are machines without ip addresses in azure (i.e. suspended vms)
 2014-08-08 16:28:58 -06:00
Thomas S Hatch
7a7c18cd46 Merge pull request #14843 from whiteinge/salt-npm-no-changes 
Fix missing npm check for no action
 2014-08-08 16:23:26 -06:00
Thomas S Hatch
d6465fe75c Merge pull request #14841 from terminalmage/fix-new-outputter 
Fix formatting in newline_values_only docstring
 2014-08-08 16:23:02 -06:00
Gareth J. Greenaway
a172c71d6d Giving the file.directory option the ability to ignore files or directories when recursively setting the ownership, group ownership and permissions. 2014-08-08 15:12:17 -07:00
Thomas S Hatch
376cab00de Lint fixes 2014-08-08 16:03:13 -06:00
Thomas S Hatch
1e32151302 Merge branch 'FreeBSD-jail-jls' of https://github.com/clinta/salt into clinta-FreeBSD-jail-jls 2014-08-08 16:02:43 -06:00
Thomas S Hatch
e311dae191 Merge pull request #14761 from terminalmage/update-spec 
Update RPM spec for 2014.1.10
 2014-08-08 15:57:43 -06:00
Thomas S Hatch
18df0f9028 Merge pull request #14758 from cachedout/14736 
Prep ipv4/6 socket for syndic
 2014-08-08 15:57:05 -06:00
Thomas S Hatch
f327d3a473 Merge pull request #14858 from terminalmage/rename-delim-arg 
Deprecate "delim" argument in favor of "delimiter"
 2014-08-08 15:49:37 -06:00
Thomas S Hatch
b166b0c7c1 Merge branch '2014.7' into develop 2014-08-08 15:48:01 -06:00
Thomas S Hatch
d6e3ce1c98 Merge pull request #14857 from thatch45/2014.7 
Revert "Pull out pending_events changes and reuse"
 2014-08-08 15:44:24 -06:00
rallytime
1d35d59ae4 Fix docs and CLI examples for git.config_get 2014-08-08 13:35:22 -06:00
rallytime
3714234231 Update docs arg order to match git_config's def 2014-08-08 13:32:19 -06:00
rallytime
10fa9eaadb Change CLI example to match git_config arg ordering 2014-08-08 13:27:16 -06:00
Erik Johnson
2d3ee9baa9 Merge pull request #14861 from kamaln7/patch-1 
Replace all occurrences of "Digital Ocean" with "DigitalOcean"
 2014-08-08 14:25:37 -05:00
Kamal Nasser
825bb191bf Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-08 22:16:37 +03:00
Thomas S Hatch
b0561a703b Revert "Pull out pending_events changes and reuse" 
This reverts commit e832a3a17f.
 2014-08-08 12:49:46 -06:00
Erik Johnson
574a9d10b8 Rename misspelled CLI argument 2014-08-08 12:54:02 -05:00
Erik Johnson
6a3c290325 Rename misspelled CLI argument 2014-08-08 12:54:02 -05:00
Erik Johnson
7240fcae53 salt.modules.match: Deprecate the "delim" argument 
This is being replaced by "delimiter" to make it more user-friendly.
 2014-08-08 12:50:26 -05:00
Erik Johnson
8c126f6b13 rename "delim" argument to "delimiter" 2014-08-08 12:29:26 -05:00
Erik Johnson
6943f97e3c rename "delim" argument to "delimiter" 2014-08-08 12:29:26 -05:00
Thomas S Hatch
fa69c91462 Merge pull request #14851 from Nibbler999/fedora-arch-detection 
Query rpm to determine arch on Fedora. Fixes #14850
 2014-08-08 11:13:59 -06:00
Thomas S Hatch
e3a4bff08a Merge pull request #14552 from makinacorpus/lxc 
[only review atm, do not merge] module.lxc: support for complex network scenariis.
 2014-08-08 11:07:40 -06:00
Mike Place
95eea1fd92 Call subprocess directly 2014-08-08 09:56:26 -06:00
Thomas S Hatch
82957bb5cc Merge pull request #14842 from s0undt3ch/hotfix/manage.version 
Skip tests if real mock library is not available
 2014-08-08 09:24:41 -06:00
Tommy Atkinson
e13383883a Query rpm to determine arch on Fedora. Fixes #14850 2014-08-08 16:57:17 +02:00
Joseph Hall
94f82e0c82 Merge pull request #14849 from 7oku/patch-1 
removed doubled "provider: azure" statement
 2014-08-08 07:25:47 -06:00
Joseph Hall
cd90801894 Merge pull request #14848 from sbellem/docs 
Fixed typos
 2014-08-08 07:25:02 -06:00
7oku
bb7c60fff8 removed doubled "provider: azure" statement 
needed once only
 2014-08-08 14:55:19 +02:00
Sylvain Bellemare
54f97b3b06 Fixed typos 2014-08-08 14:39:28 +02:00
Joseph Hall
8149bab1d9 Merge pull request #14847 from sbellem/docs 
Fixed typo
 2014-08-08 04:22:37 -06:00
Sylvain Bellemare
8d3dbabb4a Fixed typo 2014-08-08 12:16:47 +02:00
7oku
986dfed0e4 fixed bug preventing salt-cloud to work when there are machines without ip addresses reported by azure (i.e. suspended vms) 2014-08-08 10:21:04 +02:00