[Openshmem-list] Fixed Merge

[Dinan, James]

Hi All,

TL;DR - Everything is fine; there was a minor inconsistency that I fixed.  Please pull updates.

We inadvertently merged one of the proposals that was ratified at the last meeting into master instead of osh_spec_next.  I updated the branches to fix this by applying the change to osh_spec_next and reverting the change on master, so the spec is back in the correct state (master is OpenSHMEM 1.3 and osh_spec_next is draft 1.4).

Unfortunately, the change has confused the github web UI and it now suggests creating a PR to merge master into osh_spec_next (which would be incorrect, since this would revert the change we ratified).  Hopefully this doesn't lead to confusion.  If it does, please let me know and I can fix it (e.g. by merging master to osh_spec_next and re-applying the change from the proposal in question).  The fix to un-confuse the github web interface is easy, it's just a little extra churn in the history.  If you want me to fix this, please say so.

In the future, I'll be sure to check that proposals are based on the correct branch before merging.

Best,
 ~Jim.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.openshmem.org/pipermail/openshmem-list/attachments/20170331/d8094947/attachment.html>