]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 807e332) | patch
mgr/ansible: Solve merge problems
authorJuan Miguel Olmo Martínez <jolmomar@redhat.com>
Wed, 23 Jan 2019 12:49:07 +0000 (13:49 +0100)
committerJuan Miguel Olmo Martínez <jolmomar@redhat.com>
Wed, 23 Jan 2019 12:49:07 +0000 (13:49 +0100)
commit34b993c2cfc7484b11e5f73694941c43cb879f47
tree505b220d14e65380e7af2c770dc5713d2c04903atree | snapshot
parent807e3325f7255cfe04bf0de8bd755b64ed5048becommit | diff
mgr/ansible: Solve merge problems

Add/fix <forgotten> things after a <git rebase --onto>

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
src/pybind/mgr/ansible/ansible_runner_svc.py diff | blob | history
src/pybind/mgr/ansible/module.py diff | blob | history
src/pybind/mgr/orchestrator.py diff | blob | history
src/pybind/mgr/orchestrator_cli/module.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.