Commit Graph

35332 Commits

Author SHA1 Message Date
Pedro Algarvio
26c9f9e79d Use exc_info_on_loglevel instead of exc_info 2014-08-10 04:00:01 +01:00
Pedro Algarvio
80897669a4 Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:59:53 +01:00
Pedro Algarvio
44ca136f79 Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:59:52 +01:00
Pedro Algarvio
f2164fd9d3 Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:59:41 +01:00
Pedro Algarvio
6ef1c64dc2 Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:59:41 +01:00
Pedro Algarvio
9a669a115e Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:59:37 +01:00
Pedro Algarvio
0b22164ac2 Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:59:31 +01:00
Pedro Algarvio
eb6f61fefa Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:59:25 +01:00
Pedro Algarvio
26c28d3646 Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:59:21 +01:00
Pedro Algarvio
d582859c9e Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:59:07 +01:00
Pedro Algarvio
1da2987e74 Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:59:06 +01:00
Pedro Algarvio
c9264a6a49 Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:59:02 +01:00
Pedro Algarvio
fef47cf00b Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:58:50 +01:00
Pedro Algarvio
c70452bbce Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:58:46 +01:00
Pedro Algarvio
82278ef6e2 Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:58:37 +01:00
Pedro Algarvio
4335f9315f Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:58:26 +01:00
Pedro Algarvio
0acf30017c Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:58:16 +01:00
Pedro Algarvio
e9f8340d74 Use exc_info_on_loglevel instead of exc_info 2014-08-10 03:58:11 +01:00
Pedro Algarvio
175adb6e30 Remove trailing white-space 2014-08-10 03:48:03 +01:00
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