Commit History

Author SHA1 Message Date
  Chris Rebert a53ae15d23 copyedits 10 years ago
  Thomas S Hatch f0009be6c2 Merge branch '2014.7' into develop 10 years ago
  Thomas S Hatch 2d47589c88 Merge pull request #15140 from terminalmage/pygit2-auth 10 years ago
  Seth House 4abc45397d Merge remote-tracking branch 'upstream/2014.7' into develop 10 years ago
  Erik Johnson c8be676577 Update gitfs documentation 10 years ago
  Mike Place 94543fe68d Document seco range 10 years ago
  Seth House c9390ebb00 Merge pull request #14907 from cachedout/doc_master_proc 10 years ago
  Seth House b5bf67fdd1 Merge branch 'copyediting' of https://github.com/hulu/salt into develop 10 years ago
  Mike Place a352cc4521 Explain the number of master procs and worker_threads 10 years ago
  Chris Rebert 75d28df71d Begone, "allows to" (sic) ! 10 years ago
  Nitin Madhok e7bea7cc87 Fixing sphinx Warnings and Errors 10 years ago
  Jeff Schroeder b0467e2265 Add version added for pillar_source_merging_strategy 10 years ago
  Thomas Jackson 0ce353ddfb Add master_id to master docs 10 years ago
  rallytime a8cd830d52 Change "Helium" to 2014.7.0 in affected docs 10 years ago
  Volker Schwicking f3d6c705ee add settings multimaster-pki 10 years ago
  Thomas S Hatch 1577bf0fad Merge pull request #14178 from khrisrichardson/spelling 10 years ago
  Colton Myers 08d7847e44 Add configuration file location for minion (and FreeBSD for master) 10 years ago
  Khris Richardson 1acd82f3f1 add sphinx spelling extension. enforce en_us 10 years ago
  Erik Johnson 2849950bce Docs cleanup 10 years ago
  vs 16269130e6 Merge remote-tracking branch 'upstream/develop' into minion_failover_master 10 years ago
  Thomas S Hatch b8897a5b0d rename the sls renderer to the yamlex renderer 10 years ago
  Thomas S Hatch 185eae31cd Merge branch 'serializers-migration' of https://github.com/johnnoone/salt into johnnoone-serializers-migration 10 years ago
  vs f007cfecd5 add missing 's' 10 years ago
  vs 22d590a9cc added max_minions setting 10 years ago
  vs 918502c8fe added section for 'presence_events' 10 years ago
  Erik Johnson 3bcfc735f8 Add dulwich to gitfs_provider docs 10 years ago
  Erik Johnson 8d4370accc Fix indentation 10 years ago
  Seth House 59f2d07ffb Bunch of misc rST fixes 10 years ago
  Thomas S Hatch a74828f437 Fixes for #12673 10 years ago
  steverweber 84bfe9ce18 auto accept keys in minions_autosign 10 years ago