etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.15'

This commit is contained in:
Rohit Yadav 2021-02-19 13:28:16 +05:30
parent 13ba9d5100 aab2447656
commit 9ce70afccf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/api/discovery/src/main/java/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
View File

@ -20,6 +20,7 @@ import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -67,7 +68,7 @@ public class ApiDiscoveryServiceImpl extends ComponentLifecycleBase implements A
if (s_apiNameDiscoveryResponseMap == null) { if (s_apiNameDiscoveryResponseMap == null) {
long startTime = System.nanoTime(); long startTime = System.nanoTime();
s_apiNameDiscoveryResponseMap = new HashMap<String, ApiDiscoveryResponse>(); s_apiNameDiscoveryResponseMap = new HashMap<String, ApiDiscoveryResponse>();
Set<Class<?>> cmdClasses = new HashSet<Class<?>>(); Set<Class<?>> cmdClasses = new LinkedHashSet<Class<?>>();
for (PluggableService service : _services) { for (PluggableService service : _services) {
s_logger.debug(String.format("getting api commands of service: %s", service.getClass().getName())); s_logger.debug(String.format("getting api commands of service: %s", service.getClass().getName()));
cmdClasses.addAll(service.getCommands()); cmdClasses.addAll(service.getCommands());

4
systemvm/debian/opt/cloud/bin/vr_cfg.sh
View File

@ -33,7 +33,7 @@ while getopts 'c:' OPTION; do
esac; done esac; done
export DEFER_CONFIG=true export DEFER_CONFIG=true
while read line; do cat $cfg | while read line; do
#comment #comment
if [[ $line == \#* ]]; then if [[ $line == \#* ]]; then
continue continue
@ -74,7 +74,7 @@ while read line; do
fi fi
done < $cfg done
# archive the configuration file # archive the configuration file
mv $cfg /var/cache/cloud/processed/ mv $cfg /var/cache/cloud/processed/