summaryrefslogtreecommitdiff
path: root/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
AgeCommit message (Collapse)AuthorFilesLines
2020-04-03phosphor-settingsd: srcrev bump 3d805fe94a..6f62cc844bAndrew Geissler1-2/+2
And convert recipe to python3. Patrick Williams (3): python2 to python3 conversion MAINTAINERS: update Deepak's email address delete deprecated python scripts (From meta-phosphor rev: afc2415faf43876cd80ed9a93229a7e7e2499b31) Change-Id: I62f4df660fc589a084f8d48effb6cfe2d82ae4da Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2018-09-06meta-phosphor: Move layer content from common/Brad Bishop1-0/+58
Adopt a more conventional directory hierarchy. meta-phosphor is still a _long_ way from suitable for hosting on yoctoproject.org but things like this don't help. (From meta-phosphor rev: 471cfcefa74b8c7ceb704cb670e6d915cf27c63b) Change-Id: I3f106b2f6cdc6cec734be28a6090800546f362eb Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>