apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix upgrade

Browse Source
This commit is contained in:
Edison Su 2012-02-09 14:30:35 -08:00
parent e6d6e3b90a
commit 498d57fa3d
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
View File

@ -57,12 +57,9 @@ import com.cloud.agent.api.SecStorageFirewallCfgCommand;
import com.cloud.agent.api.SecStorageFirewallCfgCommand.PortConfig;
import com.cloud.agent.api.SecStorageSetupAnswer;
import com.cloud.agent.api.SecStorageSetupCommand;
<<<<<<< HEAD
=======
import com.cloud.agent.api.SecStorageSetupCommand.Certificates;
import com.cloud.agent.api.StartupSecondaryStorageCommand;
import com.cloud.agent.api.SecStorageFirewallCfgCommand.PortConfig;
>>>>>>> 0776447... bug 13470: add cert chain in db, and also open the api to upload a cert chain
import com.cloud.agent.api.SecStorageVMSetupCommand;
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StartupSecondaryStorageCommand;

1
server/src/com/cloud/upgrade/dao/Upgrade2213to2214.java
View File

@ -94,6 +94,7 @@ public class Upgrade2213to2214 implements DbUpgrade {
@Override
public void performDataMigration(Connection conn) {
fixIndexes(conn);
upgradeCerts(conn);
}
@Override