Merge from master 70/1670/1
authorBob Gallagher <bob.gallagher@riftio.com>
Mon, 24 Apr 2017 17:57:43 +0000 (13:57 -0400)
committerBob Gallagher <bob.gallagher@riftio.com>
Mon, 24 Apr 2017 17:57:43 +0000 (13:57 -0400)
commitbb337a9c9faedfff2ad9955b150940c3dc17069b
tree2d1f5c3adfa4799d8504a6259db018a33f4deb51
parent97a42df90e3612d2342f4ae2bbcf19879830313e
Merge from master

Change-Id: I8d374af11a10b7ba37d25a8c6c2b89275a49beb6
Signed-off-by: Bob Gallagher <bob.gallagher@riftio.com>
skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaFactory.js
skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
skyquake/plugins/launchpad/src/instantiate/instantiateStore.js