From 75324dab26124f132089e6f6f3378059a3a2338a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 17 Oct 2011 17:31:46 +0200 Subject: [PATCH 1/2] onedb: The 3.0 migrator was renamed to 3.0.0 in one-3.0, but not in master. See commit:ac2f9966 --- src/onedb/{2.9.90_to_3.0.rb => 2.9.90_to_3.0.0.rb} | 4 ++-- src/onedb/{3.0_to_3.1.0.rb => 3.0.0_to_3.1.0.rb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename src/onedb/{2.9.90_to_3.0.rb => 2.9.90_to_3.0.0.rb} (98%) rename src/onedb/{3.0_to_3.1.0.rb => 3.0.0_to_3.1.0.rb} (100%) diff --git a/src/onedb/2.9.90_to_3.0.rb b/src/onedb/2.9.90_to_3.0.0.rb similarity index 98% rename from src/onedb/2.9.90_to_3.0.rb rename to src/onedb/2.9.90_to_3.0.0.rb index 880685a74c..10a14e6f23 100644 --- a/src/onedb/2.9.90_to_3.0.rb +++ b/src/onedb/2.9.90_to_3.0.0.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 diff --git a/src/onedb/3.0_to_3.1.0.rb b/src/onedb/3.0.0_to_3.1.0.rb similarity index 100% rename from src/onedb/3.0_to_3.1.0.rb rename to src/onedb/3.0.0_to_3.1.0.rb From 7aff65c28c8f75f4a7991011f731b0008a8cfe82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 17 Oct 2011 09:06:22 -0700 Subject: [PATCH 2/2] Bug in previous commit:75324dab, a file was renamed but install.sh was not updated --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 88b3e4ca66..56a6f530af 100755 --- a/install.sh +++ b/install.sh @@ -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"