module-nginx/spec/defines
Daniel Black a66cd98ea9 Merge https://github.com/ese/puppet-nginx into hash
Resolved Conflicts:
	spec/defines/resource_location_spec.rb
	templates/vhost/vhost_location_alias.erb
	templates/vhost/vhost_location_directory.erb
	templates/vhost/vhost_location_empty.erb
	templates/vhost/vhost_location_fastcgi.erb
	templates/vhost/vhost_location_proxy.erb
	templates/vhost/vhost_location_stub_status.erb
2014-03-08 01:20:58 +11:00
..
resource_location_spec.rb Merge https://github.com/ese/puppet-nginx into hash 2014-03-08 01:20:58 +11:00
resource_mailhost_spec.rb Update tests accroding to changed templates 2014-02-03 13:13:06 +01:00
resource_upstream_spec.rb Update test to reflect modified template from #171 2014-02-03 14:36:06 +01:00
resource_vhost_spec.rb Key value parameter maps to take array as value 2014-03-07 23:53:32 +11:00