Commit History

Author SHA1 Message Date
  Colton Myers 66f4641be3 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 9 years ago
  Mike Place 507fb04683 Issue warning that some log levels may contain sensitive data 9 years ago
  Colton Myers 1502a39779 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 9 years ago
  Colton Myers 32f5345d7d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 9 years ago
  Jacob Hammons 133d5f7885 some small changes 9 years ago
  Jacob Hammons d220c83f77 master_finger configuration docs 9 years ago
  Colton Myers e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 9 years ago
  Justin Findlay d73964ea3c add console_log_fmt color documentation 9 years ago
  Mike Place 0dc28ad3e4 Return to `str` for master_type for 2015.5 9 years ago
  Colton Myers 24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 9 years ago
  Stephen D. Spencer f6dbeaf0e4 replace bad value for master_type in example minion config 9 years ago
  Justin Findlay e4a40b7bd8 comment whitespace in minion config 9 years ago
  Justin Findlay 44cb167744 adding sudo_user minion config docs 9 years ago
  Colton Myers acb7c6f52b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 9 years ago
  C. R. Oldham f0c9204d8b Add references to failover parameters in conf 9 years ago
  Z. Liu 55db1bf8b5 sate_output_profile default to True 10 years ago
  Z. Liu 991922703b fix type: statei -> state 10 years ago
  Z. Liu 0549ca6266 add 'state_output_profile' option for profile output 10 years ago
  Mike Place 3bc74501e4 Document many core opts 9 years ago
  Nicole Thomas 44c7eb4d4b Merge pull request #22169 from basepi/merge-forward-develop 9 years ago
  Colton Myers 124ad51c40 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 9 years ago
  Justin Findlay 294dfe2d94 clarify and expand console log colors help 9 years ago
  Colton Myers 7ba2404cc9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 9 years ago
  C. R. Oldham 5dbb0d433d Clarify how defaults are indicated in the config files. 9 years ago
  Damian Myerscough 822c5ea626 The -F options shows all key fingerprints, -f allows you to filter out a specific key 9 years ago
  Mike Place 9c225cb84d ZeroMQ socket monitoring 9 years ago
  Mike Place ec60d03e54 ZeroMQ socket monitoring 9 years ago
  Mike Place c96b4725ae Merge pull request #20465 from cachedout/safemode_config 9 years ago
  Mike Place f9cb6cdeeb Fix mismatched config value for auth_safemode 9 years ago
  rallytime 9898fcf613 Merge branch '2015.2' into 'develop' 9 years ago