{"body":"[root@KollaDevAuto kolla-bringup]#     cd kolla-kubernetes\n[root@KollaDevAuto kolla-kubernetes]#     git fetch git://git.openstack.org/openstack/kolla-kubernetes refs/changes/40/439740/17 && git cherry-pick FETCH_HEAD\nremote: Counting objects: 13, done.\nremote: Compressing objects: 100% (6/6), done.\nremote: Total 7 (delta 6), reused 1 (delta 1)\nUnpacking objects: 100% (7/7), done.\nFrom git://git.openstack.org/openstack/kolla-kubernetes\n * branch            refs/changes/40/439740/17 -> FETCH_HEAD\nerror: could not apply 241b315... Fix problem with kollakube res create configmap\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n","name":"","extension":"txt","url":"https://www.irccloud.com/pastebin/HNyH6GyN","modified":1490888632,"id":"HNyH6GyN","size":740,"lines":12,"own_paste":false,"theme":"","date":1490888632}