Commit History

Author SHA1 Message Date
  rallytime 308aa5fd61 Merge branch '2016.3' into 'develop' 8 years ago
  Mike Place 854d34aa30 Merge pull request #31626 from isbm/isbm-md5-to-sha1-dev 8 years ago
  Mike Place b0f1846259 Merge pull request #31832 from adelcast/dev/adelcast/disable_master_2 8 years ago
  Mike Place 64ca65954a Add docs for master_tries 8 years ago
  Alejandro del Castillo 4277ac6d90 add disable option to 'master_type' minion config token 8 years ago
  rallytime 838dc12b77 Merge branch '2015.8' into '2016.3' 8 years ago
  Bo Maryniuk 373493c13f Remove SHA1 for SHA256 8 years ago
  Bo Maryniuk 95cb59dec7 Set defalt hash as SHA1 in config and explain why. 8 years ago
  Bo Maryniuk f276441ae8 Suggest hash SHA256 in the configs as a defaut and explain why. 8 years ago
  rallytime 40cd0ac8fe Merge branch '2016.3' into 'develop' 8 years ago
  rallytime 3b74d123af Merge branch '2015.8' into '2016.3' 8 years ago
  Jacob Hammons a72dc15720 Assorted doc issues 8 years ago
  rallytime 73d73e80c1 Merge branch '2016.3' into 'develop' 8 years ago
  Colton Myers 076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 8 years ago
  Carson Anderson 10f8df2867 cmd is not a valid module name 8 years ago
  Benjamin Drung bf92c3663b Fix typo formating -> formatting 8 years ago
  Jake Davis 4cbf49d487 Rename 'pillar_cache' as 'minion_pillar_cache.' 8 years ago
  Jake Davis 60f7e3ea01 Fixed chmod lint issue. Added notices about security implications. 8 years ago
  Jake Davis 616e9c3f2b Add pillar_cache functionality to minion. 8 years ago
  Thayne Harbaugh 460a3c98cc Additional corrections to use option defaults directly from salt.config 9 years ago
  Colton Myers 17b919e9ec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 9 years ago
  Jacob Hammons 44ce704206 Updated `zmq_monitor` docs 9 years ago
  Colton Myers 7f8e666b8c Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 9 years ago
  Colton Myers d73a7d6c4d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 9 years ago
  Jered Sutton 01dbf385ef Adding random_master to reference and updating master_shuffle. 9 years ago
  Brendan Beveridge a2c6592d60 add proxy_username/password and doc for the minion 9 years ago
  Christophe Drevet-Droguet dde62118b1 grains_deep_merge minion configuration 9 years ago
  Colton Myers 8a23181dd7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 9 years ago
  Colton Myers aeeaa7c90d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 9 years ago
  Mike Place 78f4894333 Add note about disabling master_alive_interval 9 years ago