Skip to content

Commit 7bb3b6e

Browse files
committed
fixed noredist build failure
1 parent f64c0e6 commit 7bb3b6e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,12 +486,12 @@ public void checkAccess(Account account, VpcOffering vof, DataCenter zone) throw
486486
}
487487

488488
@Override
489-
public Map<String, String> getKeys(GetUserKeysCmd cmd){
489+
public Pair<Boolean, Map<String, String>> getKeys(GetUserKeysCmd cmd){
490490
return null;
491491
}
492492

493493
@Override
494-
public Map<String, String> getKeys(Long userId) {
494+
public Pair<Boolean, Map<String, String>> getKeys(Long userId) {
495495
return null;
496496
}
497497

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ public ListResponse<UserResponse> searchForUsers(ResponseView responseView, List
659659
Pair<List<UserAccountJoinVO>, Integer> result = searchForUsersInternal(cmd);
660660
ListResponse<UserResponse> response = new ListResponse<UserResponse>();
661661
if (CallContext.current().getCallingAccount().getType() == Account.Type.ADMIN) {
662-
responseView = ResponseView.Full;
662+
responseView = ResponseView.Full;
663663
}
664664
List<UserResponse> userResponses = ViewResponseHelper.createUserResponse(responseView, CallContext.current().getCallingAccount().getDomainId(),
665665
result.first().toArray(new UserAccountJoinVO[result.first().size()]));

0 commit comments

Comments
 (0)