Merge "Rename nova-xvnvncproxy file"

This commit is contained in:
Jenkins 2015-05-19 21:46:47 +00:00 committed by Gerrit Code Review
commit 7d68b36722
3 changed files with 4 additions and 4 deletions

View File

@ -59,7 +59,7 @@
<xi:include href="../../common/tables/nova-volumes.xml"/> <xi:include href="../../common/tables/nova-volumes.xml"/>
<xi:include href="../../common/tables/nova-vpn.xml"/> <xi:include href="../../common/tables/nova-vpn.xml"/>
<xi:include href="../../common/tables/nova-xen.xml"/> <xi:include href="../../common/tables/nova-xen.xml"/>
<xi:include href="../../common/tables/nova-xvpnvncproxy.xml"/> <xi:include href="../../common/tables/nova-xvpvncproxy.xml"/>
<xi:include href="../../common/tables/nova-zookeeper.xml"/> <xi:include href="../../common/tables/nova-zookeeper.xml"/>
</section> </section>
<xi:include href="section_compute-sample-configuration-files.xml"/> <xi:include href="section_compute-sample-configuration-files.xml"/>

View File

@ -375,9 +375,9 @@ web vnc
wsgi_default_pool_size api wsgi_default_pool_size api
wsgi_keep_alive api wsgi_keep_alive api
wsgi_log_format api wsgi_log_format api
xvpvncproxy_base_url xvpnvncproxy xvpvncproxy_base_url xvpvncproxy
xvpvncproxy_host xvpnvncproxy xvpvncproxy_host xvpvncproxy
xvpvncproxy_port xvpnvncproxy xvpvncproxy_port xvpvncproxy
api_database/connection database api_database/connection database
api_database/connection_debug database api_database/connection_debug database
api_database/connection_trace database api_database/connection_trace database