tree 3be676cff497e56208848542c6c1b08ce0fea64c
parent 4131aea0bb3f50f5012972ed909e92bc3879a60b
parent f29123811957008be1a677a7b85a5125e18a2dc8
author Feist, James <james.feist@intel.com> 1520956742 -0700
committer Gerrit Code Review <gerrit@fmygit6002.fm.intel.com> 1520956742 -0700

Merge "Modify json configuration and Skylake template"