1
0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-24 21:34:01 +03:00

feature #2989: Fix merge of 2989

This commit is contained in:
Ruben S. Montero 2014-07-13 12:10:59 +02:00
parent e4c4e6a03a
commit 9515b8c9db

View File

@ -841,7 +841,6 @@ VMM_EXEC_AZ_SCRIPTS="src/vmm_mad/remotes/az/cancel \
src/vmm_mad/remotes/az/poll \
src/vmm_mad/remotes/az/shutdown \
src/vmm_mad/remotes/az/az_driver.rb"
>>>>>>> feature-2989
#-------------------------------------------------------------------------------
# Information Manager Probes, to be installed under $REMOTES_LOCATION/im