Directories need to be executable.  If not, you can't cd into them,
and some of the ceph recipes fail.
Add the HTTP Host: to the access_log record.  Useful when using bucket based sub-domains.
If cephx is disabled, skip all the key generation and authentication.
Merge branch 'add-vhost-to-accesslog' into cdmaster
Merge branch 'ignore-cephx-if-disabled' into cdmaster
When generating the RadosGW VHost, add support for optional ServerAliases.
Merge branch 'rgw_host_aliases' into cdmaster
Merge branch 'master' into cdmaster
Merge branch 'directories-are-executable' into cdmaster
When generating the RadosGW VHost, add support for optional ServerAliases.
Conform to coding standards.
Merge branch 'rgw_host_aliases' into cdmaster

Conflicts:
	templates/default/rgw.conf.erb
Merge branch 'master' into cdmaster
Syntax error, closing tag is -> instead of -%>
Merge branch 'rgw_host_aliases' into cdmaster
Berks init.  Copied dependencies from metadata.rb to Berksfile
Loop directires should close with -%> too.
Merge branch 'rgw_host_aliases' into cdmaster
Merge branch 'master' into cdmaster

Conflicts:
	recipes/mon.rb
	recipes/osd.rb
Record cephx being the default in the attributes.
If cephx is explicitly disabled, then don't generate the keys