[Pulp-dev] do we have master branch screwed up?

[Ina Panova]

Today i accidentally stumbled across some inconsistencies on pulp/pulp
master branch while looking into some Nectar related stuff

1) master branch has the commit ab277d4f9c11cb539ed82236881621962b8ef721 in
the git history
2) git blame or git history of the file itself does not show anything, the
code change is not on master.
3) 2.-14dev branch which was branched from master does contains the commit
and the code changes.

Same for f36a5b96ad60d594cc875faf0ce395d80d63ac75 which is the fix for
#2783, i cannot see the code changes on master branch.

Is there any black magic happening again?


--------
Regards,

Ina Panova
Software Engineer| Pulp| Red Hat Inc.

"Do not go where the path may lead,
 go instead where there is no path and leave a trail."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/pulp-dev/attachments/20170907/d8ff05c3/attachment.htm>