Permalink
Commits on Feb 16, 2017
  1. add Salt Enterprise photo

    committed Feb 16, 2017
Commits on Feb 13, 2017
  1. Merge pull request #39306 from markuskramerIgitt/writing_documentation

    rst table requires plus-signs for column
    cachedout committed on GitHub Feb 13, 2017
  2. Merge pull request #39274 from markuskramerIgitt/develop

    Optionally format version conforming to Windows msi numbering scheme.
    cachedout committed on GitHub Feb 13, 2017
  3. Merge pull request #39302 from terminalmage/loader-virtual-aliases

    Add __virtual_aliases__ feature to the loader
    cachedout committed on GitHub Feb 13, 2017
  4. Merge pull request #39366 from dglloyd/patch-1

    Pass sig to service.status in after_toggle
    cachedout committed on GitHub Feb 13, 2017
  5. Merge pull request #39320 from s0undt3ch/features/py3

    Py3 Fixes
    cachedout committed on GitHub Feb 13, 2017
  6. Don't use repr

    s0undt3ch committed on GitHub Feb 13, 2017
  7. Merge pull request #39319 from bricewge/develop

    fix  #39318
    cachedout committed on GitHub Feb 13, 2017
  8. Merge pull request #39330 from steinliber/repair_aliyun_api_problem

    repair aliyun api problem
    cachedout committed on GitHub Feb 13, 2017
  9. Merge pull request #39332 from morganwillcock/shutdown-state

    Add shutdown and reboot functions to win_system state module
    cachedout committed on GitHub Feb 13, 2017
  10. Merge pull request #39352 from Unity-Technologies/hotfix/adb_no_devices

    Fix adb beacon when there are no devices
    cachedout committed on GitHub Feb 13, 2017
  11. Pass sig to service.status in after_toggle

    As on line 350, pass `sig` to `service.status` to ensure that the correct behavior is used. If we don't pass `sig`, upstart/sysv jobs that do not implement `service <name> status` will fail.
    dglloyd committed on GitHub Feb 13, 2017
  12. Merge pull request #39356 from cloudflare/table_out_fix

    Fix table outputter opts
    cachedout committed on GitHub Feb 13, 2017
  13. We really don't need to decode the string prior to writing it to file.

    Plus, this also avoids handling Py2 and Py3 differently.
    s0undt3ch committed Feb 13, 2017
  14. Fix table outputter opts

    mirceaulinic committed Feb 13, 2017
  15. Fix add beacon when there are no devices

    - Changed the assumption that having 0 lines means there are no devices, to actually checking there are no devices
    opdude committed Feb 13, 2017
  16. lint fixes

    morganwillcock committed Feb 13, 2017
  17. Use `six.moves.StringIO`

    s0undt3ch committed Feb 12, 2017
  18. Python 3 compatibility

    s0undt3ch committed Feb 11, 2017
  19. Under Py3, what we get from `.read()` is `bytes`.

    Using `six.b()` in this particular case is all we need to do.
    s0undt3ch committed Feb 10, 2017