[COOK-1316] Added attribute for default site, added condition to commons... #10

Merged
merged 2 commits into from Jul 18, 2012

Conversation

Projects
None yet
3 participants

@miketheman This cannot be automatically merged, indicating a conflict. Can you rebase w/ master and reapply your patch and update the pull request? Thanks!

Owner

miketheman commented Jun 15, 2012

This should be merge-worthy now.

jtimberman merged commit 2638b7b into miketheman:master Jul 18, 2012

ashmere commented Sep 5, 2012

it looks like this merge wasn't completed on partly
recipes/commons.rb line 65 - cook-1316
-nginx_site 'default'
+nginx_site 'default' if node['nginx']['default_site_enabled']

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment