Merge upstream, address conflict in src/utils/cmds/cmds_test.c
authorZebity Spring <zebity@yahoo.com>
Fri, 12 Jul 2019 07:33:46 +0000 (17:33 +1000)
committerMatthias Runge <mrunge@redhat.com>
Fri, 19 Jul 2019 07:50:01 +0000 (09:50 +0200)
commita4cd456fcdf80053fe12c89fc7471d39e55f60f1
tree34c54774759d030a224b0f91e296c443a718a783
parent70bcf9c6518b93d6615162b1f4c105d4d9d418ff
Merge upstream, address conflict in src/utils/cmds/cmds_test.c

(cherry picked from commit a72ad42076337f3b85db3b06565ae86a83226ab3)
src/utils/cmds/cmds_test.c