Looks good. Free to merge.

Merged to master on all 4 branches.

Ogh crap, sorry! I'm making it worse. I will do nothing until I have
instructions. Sorry! I thought that would fix everything but now I realize
my mistake. Ok, so I reset HEAD by 1 (git reset HEAD~). Then I stashed my
changes (should have used --hard when I did git reset). Then I should have
done a git push to update the remote. Instead I did a merge (git merge
--no-ff tickets/DM-3692). Then I pushed (git push).

I realize what I've done wrong. I'm not sure if you trust me to try to undo
it. But I think that what I should do is
1. from master do a git pull to get the remote
git pull
2. Undo the last two commits with
git reset HEAD~2
3. Push to master
git push
4. Now apply the commit with
git commit --no-ff tickets/DM-3692
5. Now push one last time
git push

Am I right? I'm so sorry for the mess.

-Vishal

Vishal Kasliwal
Dept of Physics & Astronomy,
The University of Pennsylvania
and
Dept of Astrophysical Sciences,
Princeton University

On Wed, Nov 25, 2015 at 11:54 AM, Lauren MacArthur (JIRA) <jira-dm@lsst.org>

As a final comment, can I ask you to update Nate's HSC merge notes (we are trying to keep track of everything pulled over from HSC, including full HSC tickets and standalone commits). You can edit the file directly on github at:
https://github.com/lsst-dm/hsc_lsst_mergeNotes/blob/master/notes.py

Ok, really finally, wearing John Swinbank's hat (and saving him the trouble), could you add a note about this added functionality to the to the release notes when you have a moment?

Done and done!

-Vishal

Vishal Kasliwal
Dept of Physics & Astronomy,
The University of Pennsylvania
and
Dept of Astrophysical Sciences,
Princeton University

On Wed, Nov 25, 2015 at 2:47 PM, Lauren MacArthur (JIRA) <jira-dm@lsst.org>