diff --git a/api/src/com/cloud/api/ApiConstants.java b/api/src/com/cloud/api/ApiConstants.java index 8bccbbccfd3..19d3b4ff125 100755 --- a/api/src/com/cloud/api/ApiConstants.java +++ b/api/src/com/cloud/api/ApiConstants.java @@ -1,4 +1,4 @@ -// Copyright 2012 Citrix Systems, Inc. Licensed under the +// Copyright 2012 Citrix Systems, Inc. Licensed under the // Apache License, Version 2.0 (the "License"); you may not use this // file except in compliance with the License. Citrix Systems, Inc. // reserves all rights not expressly granted by the License. diff --git a/awsapi/.project b/awsapi/.project new file mode 100644 index 00000000000..8bce14ddc45 --- /dev/null +++ b/awsapi/.project @@ -0,0 +1,17 @@ + + + awsapi + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 2cbcb5763eb..a230f808021 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -1,4 +1,4 @@ -// Copyright 2012 Citrix Systems, Inc. Licensed under the +// Copyright 2012 Citrix Systems, Inc. Licensed under the // Apache License, Version 2.0 (the "License"); you may not use this // file except in compliance with the License. Citrix Systems, Inc. // reserves all rights not expressly granted by the License. @@ -240,6 +240,7 @@ public class ApiResponseHelper implements ResponseGenerator { accountResponse.setDomainName(ApiDBUtils.findDomainById(account.getDomainId()).getName()); accountResponse.setState(account.getState().toString()); accountResponse.setNetworkDomain(account.getNetworkDomain()); + accountResponse.setDefaultZone(account.getDefaultZoneId()); // get network stat List stats = ApiDBUtils.listUserStatsBy(account.getId()); diff --git a/utils/conf/log4j-vmops.xml b/utils/conf/log4j-vmops.xml index 2d13ef52dbf..0ac6083d512 100644 --- a/utils/conf/log4j-vmops.xml +++ b/utils/conf/log4j-vmops.xml @@ -1,4 +1,4 @@ - +