@miketheman This cannot be automatically merged, indicating a conflict. Can you rebase w/ master and reapply your patch and update the pull request? Thanks!
[COOK-1316] Added attribute for default site, added condition to comm…
[COOK-1316] Fixing conflicts, added metadata.rb entry for the attribute
This should be merge-worthy now.
it looks like this merge wasn't completed on partly
recipes/commons.rb line 65 - cook-1316
+nginx_site 'default' if node['nginx']['default_site_enabled']