tree 5979629b9a03a6e376e7e77260cf788ba123bc42
parent a7358204c767ec5699f63a197af2f4a6a065668f
author Simon Pasquier <spasquier@mirantis.com> 1497951943 +0200
committer Simon Pasquier <spasquier@mirantis.com> 1497954430 +0000

Merge pillar + mine data for remote input plugins

This is needed to enable additional plugins (such as http_listener)
from the user/system model.

Change-Id: Ibd647e855e38a492a0de2b8ead6df755e99fe921