mirror of
https://github.com/nasa/openmct.git
synced 2025-06-16 06:08:11 +00:00
commit3f199a9f06
Merge:27fe4ed
736cba7
Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Mon Jun 27 09:04:40 2016 -0700 Merge remote-tracking branch 'origin/master' into clear-transactions-1046 Conflicts: platform/commonUI/edit/src/actions/SaveAsAction.js commit27fe4edb30
Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Jun 22 15:04:06 2016 -0700 [Edit] Mark restartTransaction as private API commit21d1938a0f
Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Jun 22 15:03:17 2016 -0700 [Edit] Clarify JSDoc commit06a83f9fa9
Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Jun 22 15:01:35 2016 -0700 [Edit] Update failing spec commit1f525160e0
Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Jun 22 14:52:43 2016 -0700 [Edit] Refer to correct variable ...when clearing transactions after a restartTransaction commitb60e94bce4
Author: Victor Woeltjen <victor.woeltjen@nasa.gov> Date: Wed Jun 22 14:38:54 2016 -0700 [Edit] Clear transactions on Save As ...such that only persistence calls associated with the saved clones are actually issued. Fixes #1046.