[OpenStack-Infra] merge problem

Sean Roberts seanrob at yahoo-inc.com
Fri Sep 13 18:40:41 UTC 2013


I am confused, can someone help me with this merge problem

  *   this patch was merged https://review.openstack.org/#/c/46182/
  *   Github has the correct xml https://github.com/openstack/openstack-manuals/blob/master/doc/training-guide/operator-editing-code.xml
  *   BUT, the code prior to the merged patch is still published at http://docs.openstack.org/trunk/openstack-training/
  *   and when I update my local repo with git pull origin master, I get the code prior to the merged patch also.
  *   If I go back to the patch that was merged https://review.openstack.org/#/c/46182/ and create a branch off of it, the correct XML is there and then create the HTML source and review it, it is correct as well.

Am I losing it or is there something broken here? I'm on the infra channel as @sarob if you want to respond that way.


Sean Roberts
Infrastructure Strategy
seanrob at yahoo-inc.com<mailto:seanrob at yahoo-inc.com> (925) 980-4729

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstack.org/pipermail/openstack-infra/attachments/20130913/652a0e76/attachment.html>


More information about the OpenStack-Infra mailing list