Adding provider_resource.template and the provider resource to kitchen sink
Adding provider_resource.template and the provider resource to kitchen sink
Merge branch 'master' of github.com:BeenzSyed/heat-templates

Conflicts:
	dev/kitchen_sink.template
Merge branch 'master' of github.com:BeenzSyed/heat-templates

Conflicts:
	dev/kitchen_sink.template
Merge branch 'master' of github.com:BeenzSyed/heat-templates
Merge pull request #30 from BeenzSyed/master

Adding provider resource to kitchen sink