| commit | 3f7def34240777e93654fa686e58deb0ddd6239b | [log] [tgz] |
|---|---|---|
| author | Joshua Hesketh <josh@nitrotech.org> | Mon Nov 21 17:36:44 2016 +1100 |
| committer | Joshua Hesketh <josh@nitrotech.org> | Tue Nov 22 11:15:24 2016 +1100 |
| tree | 70cafe88d869909d65c9a120d976840495ae0a8c | |
| parent | 8b2bc0cfe734d143eb369d2d21e086e0057685ae [diff] | |
| parent | 63a595bae3f3db85582ddba2d51ad4124877034f [diff] |
Merge branch 'master' into workingv3 This includes forward-porting changes to launcher/server.py with the exception of the pre/post playbooks changes which will be done in a follow up commit as they have deviated. Change-Id: I13aa229c1460b748745babe178c0a745e52f841c