Mike Place
7572012313
Continue if master in multi-master is down
2014-08-11 15:28:03 -06:00
Mike Place
10f7a5170c
Git ignore
2014-08-11 14:32:17 -06:00
Tom Atkinson
bab2331d6e
Allow custom grains to overwrite core grains
2014-08-11 22:22:24 +02:00
Tom Atkinson
589a220b9a
Fix string prefix check
2014-08-11 22:21:01 +02:00
Seth House
6318b94fc4
Removed unused format() arg in npm state
...
Closes #14885 . Thanks @cvrebert.
2014-08-11 14:18:54 -04:00
Thomas S Hatch
72214d9a5c
Merge pull request #14891 from cachedout/tty_move
...
Write directly to tty
2014-08-11 11:44:05 -06:00
Thomas S Hatch
daa924ebb7
Merge pull request #14878 from s0undt3ch/hotfix/exc-info-per-handler
...
[2014.7] Allow the inclusion of `exc_info` on a per handler basis.
2014-08-11 10:59:14 -06:00
Mike Place
7a6e9c15a6
Write directly to tty
...
Conflicts:
salt/modules/cmdmod.py
2014-08-11 10:57:59 -06:00
Thomas S Hatch
9e2b6c178e
Merge pull request #14873 from Nibbler999/batch-static
...
Support static option in batch mode
2014-08-11 10:50:17 -06:00
Seth House
11f4e20bd8
Fix incorrect call to state.single in npm pkgs test
2014-08-11 11:03:00 -04:00
Pedro Algarvio
cb503d39ea
Fix mixin under Py26
2014-08-11 07:23:09 +01:00
Nitin Madhok
53d3943f78
Fixing lint
2014-08-10 06:28:11 +01:00
Pedro Algarvio
7b2126c550
Make pylint ignore "non issues"
2014-08-10 06:06:41 +01:00
Pedro Algarvio
8b62e0e825
Use exc_info_on_loglevel
instead of exc_info
2014-08-10 04:01:00 +01:00
Pedro Algarvio
1159680f94
Use exc_info_on_loglevel
instead of exc_info
2014-08-10 04:00:52 +01:00
Pedro Algarvio
48b2b773e3
Use exc_info_on_loglevel
instead of exc_info
2014-08-10 04:00:49 +01:00
Pedro Algarvio
a39d20e44d
Use exc_info_on_loglevel
instead of exc_info
2014-08-10 04:00:40 +01:00
Pedro Algarvio
f693920071
Use exc_info_on_loglevel
instead of exc_info
2014-08-10 04:00:40 +01:00
Pedro Algarvio
727718e90d
Use exc_info_on_loglevel
instead of exc_info
2014-08-10 04:00:40 +01:00
Pedro Algarvio
5d3366ebed
Use exc_info_on_loglevel
instead of exc_info
2014-08-10 04:00:38 +01:00
Pedro Algarvio
c109809295
Use exc_info_on_loglevel
instead of exc_info
2014-08-10 04:00:34 +01:00
Pedro Algarvio
6a068f7c72
Use exc_info_on_loglevel
instead of exc_info
2014-08-10 04:00:22 +01:00
Pedro Algarvio
b92bfff9a6
Use exc_info_on_loglevel
instead of exc_info
2014-08-10 04:00:11 +01:00
Pedro Algarvio
be94e01b26
Use exc_info_on_loglevel
instead of exc_info
2014-08-10 04:00:07 +01:00
Pedro Algarvio
be222202ba
Use exc_info_on_loglevel
instead of exc_info
2014-08-10 04:00:04 +01:00
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
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