Merge "Merge branch 'pkg_mgmt' into v1.1" into v1.1 16/1016/1
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Wed, 25 Jan 2017 15:11:02 +0000 (16:11 +0100)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Wed, 25 Jan 2017 15:40:34 +0000 (10:40 -0500)
commitd3b3a1c5d521361bfa40dbdec779495eb2bfd8a0
treebbcdb06bb9104139384934be17f43cdfa95dc3f0
parent64b803dbd876e15a0a2d4ca46d8ce81ac18915f6
parent5c4722a7fb7e022971726d729e87b094ac891aee
Merge "Merge branch 'pkg_mgmt' into v1.1" into v1.1

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