Skip to content

Commit c1e9e4d

Browse files
bfederlebfederle
committed
Merge branch 'master' into ui-cisco-asa1000v-support
2 parents 9a8bf4a + 99d0936 commit c1e9e4d

947 files changed

Lines changed: 3446 additions & 5332 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818
build/replace.properties
1919
build/build.number
2020
bin/
21-
cloudstack-proprietary/
22-
premium/
2321
.lock-wscript
24-
artifacts/
2522
.waf-*
2623
waf-*
2724
target/
@@ -37,7 +34,7 @@ cloud-*.tar.bz2
3734
*.egg-info/
3835
*.prefs
3936
build.number
40-
api.log.*.gz
37+
*.log.*.gz
4138
cloud.log.*.*
4239
unittest
4340
deps/cloud.userlibraries
@@ -59,6 +56,7 @@ tools/cli/build/
5956
*.iso
6057
*.tar.gz
6158
*.tgz
59+
.*
6260
target-eclipse
6361
awsapi/modules/*
6462
!.gitignore

core/src/com/cloud/alert/AlertAdapter.java renamed to api/src/com/cloud/alert/AlertAdapter.java

File renamed without changes.

core/src/com/cloud/event/UsageEvent.java renamed to api/src/com/cloud/event/UsageEvent.java

File renamed without changes.

core/src/com/cloud/exception/AgentControlChannelException.java renamed to api/src/com/cloud/exception/AgentControlChannelException.java

File renamed without changes.

core/src/com/cloud/info/ConsoleProxyLoadInfo.java renamed to api/src/com/cloud/info/ConsoleProxyLoadInfo.java

File renamed without changes.

core/src/com/cloud/info/RunningHostCountInfo.java renamed to api/src/com/cloud/info/RunningHostCountInfo.java

File renamed without changes.

‎api/src/com/cloud/network/NetworkModel.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,4 +263,6 @@ Map<PublicIpAddress, Set<Service>> getIpToServices(List<? extends PublicIpAddres
263263
boolean isProviderEnabledInZone(long zoneId, String provider);
264264

265265
Nic getPlaceholderNicForRouter(Network network, Long podId);
266+
267+
Networks.IsolationType[] listNetworkIsolationMethods();
266268
}

server/src/com/cloud/network/UserIpv6Address.java renamed to api/src/com/cloud/network/UserIpv6Address.java

File renamed without changes.

‎api/src/com/cloud/network/security/SecurityGroupRules.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ public interface SecurityGroupRules extends InternalIdentity {
3131

3232
Long getRuleId();
3333

34+
String getRuleUuid();
35+
3436
int getStartPort();
3537

3638
int getEndPort();

core/src/com/cloud/resource/UnableDeleteHostException.java renamed to api/src/com/cloud/resource/UnableDeleteHostException.java

File renamed without changes.

0 commit comments

Comments
 (0)