tree e81f81ab1a754ad747a5d5bc85e3ed5650d0d81d
parent 2d500b28cb1de263137d562547e492c67971e273
parent e4df686d0a75f68183f594363253f059d1ed3a2b
author Laurence Maultsby <laurence.maultsby@riftio.com> 1484667954 -0500
committer Laurence Maultsby <laurence.maultsby@riftio.com> 1484667970 -0500

Merge branch 'pkg_mgmt' into v1.1

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