valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
84,421 Commits 24 Branches 182 Tags 341 MiB
0880121cf4
Commit Graph

10 Commits

Author SHA1 Message Date
EYJ
beea8cc376 Fix millisecond formatting to avoid 1000 as four-digit milliseconds 2016-06-02 17:43:27 +02:00
Denys Havrysh
7eaf778695 Remove trailing white spaces in conf dir file 2016-03-01 17:35:34 +02:00
Benjamin Drung
bf92c3663b Fix typo formating -> formatting 2016-02-04 12:45:19 +01:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
 2015-09-17 10:54:33 -06:00
Colton Myers
66f4641be3 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    doc/conf.py
    salt/__init__.py
    salt/cli/__init__.py
 2015-09-16 18:39:16 -06:00
Mike Place
507fb04683 Issue warning that some log levels may contain sensitive data 2015-09-14 15:39:17 -06:00
Justin Findlay
d73964ea3c add console_log_fmt color documentation 2015-07-28 16:16:29 -06:00
Justin Findlay
294dfe2d94 clarify and expand console log colors help 2015-03-26 23:21:30 -06:00
Tehmasp Chaudhri
cd7d739b02 Typo fix and formatting 2014-11-13 13:59:23 -07:00
Joseph Hall
827ba113ef Fixing up salt-cloud sample configs 2013-11-20 08:48:01 -07:00