Commit History

Author SHA1 Message Date
  Jorge Schrauwen 83b6935ab0 including said modules, would probably be a good idea too 8 years ago
  Pedro Algarvio cc3219fcde Don't install futures under Python 3 and above 9 years ago
  Colton Myers 35425b14ad Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 9 years ago
  Dennis Harper 3e08d3de8a fix for: https://github.com/saltstack/salt/issues/27373 9 years ago
  Dennis Harper cc391b6862 fix for: https://github.com/saltstack/salt/issues/27373 9 years ago
  Pedro Algarvio 10a9189d83 Merge remote-tracking branch 'upstream/2015.8' into hotfix/merge-forward-develop 9 years ago
  C. R. Oldham acc73fc546 Add salt-proxy to setup.py so it gets installed. 9 years ago
  Colton Myers 307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 9 years ago
  Jacob Hammons 701f47a658 Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py 9 years ago
  Pedro Algarvio 58df84e0d1 Revert "setup.py: remove raw string formatting" 9 years ago
  Pedro Algarvio 2188867b3d Revert "We need the `repr()` for the version tuple." 9 years ago
  Colton Myers 1bbe45538e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 9 years ago
  Pedro Algarvio 03af591129 We need the `repr()` for the version tuple. 9 years ago
  Pedro Algarvio 3f30d2a135 Use the correct names 9 years ago
  Pedro Algarvio f041653746 Handle SPM paths in the setup script 9 years ago
  Erik Johnson b6c732219c setup.py: remove raw string formatting 9 years ago
  Pedro Algarvio 60c5d16330 One more missed typo 9 years ago
  Colton Myers 73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 9 years ago
  Colton Myers e57f767244 Merge pull request #26439 from basepi/merge-forward-2015.8 9 years ago
  Pedro Algarvio dc58dbe5bf The CLI options are not meant to include underscores. 9 years ago
  Colton Myers 8ec612e9db Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 9 years ago
  Pedro Algarvio 06dcaefcaa Fix missed typo 9 years ago
  Colton Myers d3d0e004d9 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 9 years ago
  Pedro Algarvio 92af1c9572 Fix argument name 9 years ago
  Pedro Algarvio 72d2fdb512 Add `pypiwin32 >= 219` as a windows install requires. 9 years ago
  Pedro Algarvio b1105fc706 Allow mimicking the install setup command for develop/editable installations. 9 years ago
  Pedro Algarvio 26246a72ee Allow writing Salt's _version.py when installing in develop mode. 9 years ago
  Pedro Algarvio 71928f2194 Prefer HTTPS, fix url argument 9 years ago
  Pedro Algarvio 7b25430cc7 Download the necessary DLLs for windows 9 years ago
  Pedro Algarvio 86692a92cd Install PyCrypto from a wheel in repo.saltstack.com under Windows 9 years ago