Merge branch 'master' into bug-847

This commit is contained in:
Carlos Martín committed 2011-10-17 18:11:25 +02:00
commit e4fbfc96b4
3 files changed
+4 -4

No files matched your search

+2 -2
View File
@@ -653,8 +653,8 @@ IMAGE_DRIVER_FS_SCRIPTS="src/image_mad/remotes/fs/cp \
ONEDB_MIGRATOR_FILES="src/onedb/2.0_to_2.9.80.rb \
src/onedb/2.9.80_to_2.9.85.rb \
src/onedb/2.9.85_to_2.9.90.rb \
src/onedb/2.9.90_to_3.0.rb \
src/onedb/3.0_to_3.1.0.rb \
src/onedb/2.9.90_to_3.0.0.rb \
src/onedb/3.0.0_to_3.1.0.rb \
src/onedb/onedb.rb \
src/onedb/onedb_backend.rb"
@@ -18,11 +18,11 @@ include REXML
module Migrator
def db_version
"3.0"
"3.0.0"
end
def one_version
"OpenNebula 3.0"
"OpenNebula 3.0.0"
end
def up
File renamed without changes.