1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00

Add missing oZones changes (due to manual merge)

This commit is contained in:
Tino Vázquez 2011-07-15 18:05:01 +02:00
parent 3df5889e8c
commit 57c491ab29
2 changed files with 4 additions and 3 deletions

View File

@ -400,6 +400,7 @@ INSTALL_OZONES_RUBY_FILES=(
INSTALL_OZONES_FILES=(
OZONES_FILES:$OZONES_LOCATION
OZONES_BIN_FILES:$BIN_LOCATION
OZONES_ETC_FILES:$ETC_LOCATION
OZONES_MODELS_FILES:$OZONES_LOCATION/models
OZONES_TEMPLATE_FILES:$OZONES_LOCATION/templates
OZONES_LIB_FILES:$OZONES_LOCATION/lib

View File

@ -132,7 +132,7 @@ module CLIHelper
def show(data, options={})
update_columns(options)
print_table(data, options)
print_table(data, options)
end
def top(data, options={})
@ -155,7 +155,7 @@ module CLIHelper
def print_table(data, options)
CLIHelper.print_header(header_str)
print_data(data, options)
data ? print_data(data, options) : puts
end
def print_data(data, options)
@ -230,4 +230,4 @@ module CLIHelper
# TBD def sort_data!
end
end
end