tree 9632706063f48a14bd724aa9a16d1ac1bf2ab6ac
parent 5bd1094cce6f4d46084e38bcd22dbb1ecdf659c3
parent 8f1f42ce0339e356a170742ae44d261104cf530f
author Laurence Maultsby <laurence.maultsby@riftio.com> 1485963662 -0500
committer Laurence Maultsby <laurence.maultsby@riftio.com> 1485963677 -0500

Merge branch 'pkg_mgmt' into v1.1

Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>