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
..
classes	add new compile matcher	2013-12-08 16:54:25 -05:00
defines	Merge https://github.com/ese/puppet-nginx into hash	2014-03-08 01:20:58 +11:00
system	Remove vhost and mailhost vhost_autogen.conf	2013-11-30 21:24:55 -05:00
spec_helper.rb	set default facts for all manifests	2013-12-07 13:39:24 -05:00
spec_helper_system.rb	remove deprecated rspec-system-serverspec includes	2013-12-08 17:09:03 -05:00