Merge branch 'slaprunner'
Conflicts: slapos/pubsub/notifier.py
Showing
slapos/pubsub/notifier.py
100644 → 100755
File mode changed from 100644 to 100755
slapos/runner/decorators.py
0 → 100644
This diff is collapsed.
slapos/runner/process.py
0 → 100644
This diff is collapsed.