<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
</head>
<body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">
<div>
<div>I am confused, can someone help me with this merge problem</div>
<ul>
<li>this patch was merged <a href="https://review.openstack.org/#/c/46182/">https://review.openstack.org/#/c/46182/</a></li><li>Github has the correct xml <a href="https://github.com/openstack/openstack-manuals/blob/master/doc/training-guide/operator-editing-code.xml">https://github.com/openstack/openstack-manuals/blob/master/doc/training-guide/operator-editing-code.xml</a></li><li>BUT, the code prior to the merged patch is still published at <a href="http://docs.openstack.org/trunk/openstack-training/">http://docs.openstack.org/trunk/openstack-training/</a></li><li>and when I update my local repo with <b>git pull origin master</b>, I get the code prior to the merged patch also.</li><li>If I go back to the patch that was merged <a href="https://review.openstack.org/#/c/46182/">https://review.openstack.org/#/c/46182/</a> 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.</li></ul>
<div>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.</div>
</div>
<div>
<div apple-content-edited="true">
<div style="font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: -webkit-auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">
<div style="color: rgb(0, 0, 0); font-family: Calibri, sans-serif; font-size: 14px; ">
<span class="Apple-style-span" style="font-size: 13px; "><span style="font-family: Calibri; font-weight: bold; color: gray; margin: 0px; padding: 0px; "><br class="Apple-interchange-newline">
<br>
</span></span></div>
<div style="color: rgb(0, 0, 0); font-family: Calibri, sans-serif; font-size: 14px; ">
<span class="Apple-style-span" style="font-size: 13px; "><span style="font-family: Calibri; font-weight: bold; color: gray; margin: 0px; padding: 0px; ">Sean Roberts</span></span><span class="Apple-style-span" style="font-size: 13px; "><br>
</span><span class="Apple-style-span" style="font-size: 13px; "><span style="color: gray; font-family: Calibri; margin: 0px; padding: 0px; ">Infrastructure Strategy</span></span></div>
<div style="font-size: 14px; "><span class="Apple-style-span" style="font-size: 13px; "><font color="#808080" face="Calibri"><a href="mailto:seanrob@yahoo-inc.com">seanrob@yahoo-inc.com</a> </font></span><span style="color: gray; font-family: Calibri; font-size: 13px; ">(925)
980-4729</span></div>
</div>
</div>
<br>
</div>
</body>
</html>