Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added rest_tornado to _defaults.conf #96

Merged
merged 1 commit into from
Feb 6, 2015
Merged

added rest_tornado to _defaults.conf #96

merged 1 commit into from
Feb 6, 2015

Conversation

aboe76
Copy link
Member

@aboe76 aboe76 commented Feb 5, 2015

Added rest tornado configuration options to salt-master _defaults.conf

see pillar.example for configuration

@gravyboat
Copy link
Contributor

@aboe76 Hmm, am I just missing the additions to the pillar.example? I don't see anything on your branch that uses rest_tornado.

@aboe76
Copy link
Member Author

aboe76 commented Feb 6, 2015

Ow will fix it later today

@nmadhok
Copy link
Member

nmadhok commented Feb 6, 2015

@aboe76 waiting for the changes.

see pillar.example for configuration
@aboe76
Copy link
Member Author

aboe76 commented Feb 6, 2015

@nmadhok sorry needed be at work first...but got it squashed in one commit.

@nmadhok
Copy link
Member

nmadhok commented Feb 6, 2015

@aboe76 Thanks! Not a problem

nmadhok added a commit that referenced this pull request Feb 6, 2015
added rest_tornado to _defaults.conf
@nmadhok nmadhok merged commit 22fe873 into saltstack-formulas:master Feb 6, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants