salt/doc/topics/virt
rallytime 7ea9dacbdd Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
  - salt/minion.py
  - salt/modules/win_update.py
  - salt/modules/yumpkg.py
  - salt/utils/pkg/rpm.py
2016-02-18 11:10:44 -07:00
..
disk.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00
index.rst Merge branch '2015.8' into '2016.3' 2016-02-18 11:10:44 -07:00
nic.rst Whitespace cleanup 2014-12-11 07:53:19 -08:00