Skip to content

Commit c74a579

Browse files
committed
resolve build and licensefailure issue
1 parent 6bcfbc6 commit c74a579

File tree

7 files changed

+36
-30
lines changed

7 files changed

+36
-30
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.apache.cloudstack.auth.UserTwoFactorAuthenticator;
4242
import org.apache.cloudstack.backup.BackupOffering;
4343
import org.apache.cloudstack.framework.config.ConfigKey;
44+
import org.apache.cloudstack.dns.DnsServer;
4445

4546
import org.apache.cloudstack.acl.apikeypair.ApiKeyPair;
4647
import org.apache.cloudstack.acl.ControlledEntity;
@@ -510,6 +511,11 @@ public void checkAccess(Account account, BackupOffering bof) throws PermissionDe
510511
// TODO Auto-generated method stub
511512
}
512513

514+
@Override
515+
public void checkAccess(Account account, DnsServer dnsServer) throws PermissionDeniedException {
516+
// NOOP
517+
}
518+
513519
@Override
514520
public Pair<Boolean, Map<String, String>> getKeys(GetUserKeysCmd cmd){
515521
return null;

ui/src/views/network/dns/AddDnsRecord.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// Licensed to the Apache Software Foundation (ASF) under one
2-
// or more contributor license agreements. See the NOTICE file
2+
// or more contributor license agreements. See the NOTICE file
33
// distributed with this work for additional information
4-
// regarding copyright ownership. The ASF licenses this file
4+
// regarding copyright ownership. The ASF licenses this file
55
// to you under the Apache License, Version 2.0 (the
66
// "License"); you may not use this file except in compliance
7-
// with the License. You may obtain a copy of the License at
7+
// with the License. You may obtain a copy of the License at
88
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// http://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing,
1212
// software distributed under the License is distributed on an
1313
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
// KIND, either express or implied. See the License for the
14+
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

ui/src/views/network/dns/AddDnsServer.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// Licensed to the Apache Software Foundation (ASF) under one
2-
// or more contributor license agreements. See the NOTICE file
2+
// or more contributor license agreements. See the NOTICE file
33
// distributed with this work for additional information
4-
// regarding copyright ownership. The ASF licenses this file
4+
// regarding copyright ownership. The ASF licenses this file
55
// to you under the Apache License, Version 2.0 (the
66
// "License"); you may not use this file except in compliance
7-
// with the License. You may obtain a copy of the License at
7+
// with the License. You may obtain a copy of the License at
88
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// http://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing,
1212
// software distributed under the License is distributed on an
1313
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
// KIND, either express or implied. See the License for the
14+
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

ui/src/views/network/dns/AddDnsZone.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// Licensed to the Apache Software Foundation (ASF) under one
2-
// or more contributor license agreements. See the NOTICE file
2+
// or more contributor license agreements. See the NOTICE file
33
// distributed with this work for additional information
4-
// regarding copyright ownership. The ASF licenses this file
4+
// regarding copyright ownership. The ASF licenses this file
55
// to you under the Apache License, Version 2.0 (the
66
// "License"); you may not use this file except in compliance
7-
// with the License. You may obtain a copy of the License at
7+
// with the License. You may obtain a copy of the License at
88
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// http://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing,
1212
// software distributed under the License is distributed on an
1313
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
// KIND, either express or implied. See the License for the
14+
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

ui/src/views/network/dns/DnsRecordsTab.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// Licensed to the Apache Software Foundation (ASF) under one
2-
// or more contributor license agreements. See the NOTICE file
2+
// or more contributor license agreements. See the NOTICE file
33
// distributed with this work for additional information
4-
// regarding copyright ownership. The ASF licenses this file
4+
// regarding copyright ownership. The ASF licenses this file
55
// to you under the Apache License, Version 2.0 (the
66
// "License"); you may not use this file except in compliance
7-
// with the License. You may obtain a copy of the License at
7+
// with the License. You may obtain a copy of the License at
88
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// http://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing,
1212
// software distributed under the License is distributed on an
1313
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
// KIND, either express or implied. See the License for the
14+
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

ui/src/views/network/dns/UpdateDnsServer.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// Licensed to the Apache Software Foundation (ASF) under one
2-
// or more contributor license agreements. See the NOTICE file
2+
// or more contributor license agreements. See the NOTICE file
33
// distributed with this work for additional information
4-
// regarding copyright ownership. The ASF licenses this file
4+
// regarding copyright ownership. The ASF licenses this file
55
// to you under the Apache License, Version 2.0 (the
66
// "License"); you may not use this file except in compliance
7-
// with the License. You may obtain a copy of the License at
7+
// with the License. You may obtain a copy of the License at
88
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// http://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing,
1212
// software distributed under the License is distributed on an
1313
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
// KIND, either express or implied. See the License for the
14+
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

ui/src/views/network/dns/UpdateDnsZone.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// Licensed to the Apache Software Foundation (ASF) under one
2-
// or more contributor license agreements. See the NOTICE file
2+
// or more contributor license agreements. See the NOTICE file
33
// distributed with this work for additional information
4-
// regarding copyright ownership. The ASF licenses this file
4+
// regarding copyright ownership. The ASF licenses this file
55
// to you under the Apache License, Version 2.0 (the
66
// "License"); you may not use this file except in compliance
7-
// with the License. You may obtain a copy of the License at
7+
// with the License. You may obtain a copy of the License at
88
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// http://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing,
1212
// software distributed under the License is distributed on an
1313
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
// KIND, either express or implied. See the License for the
14+
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

0 commit comments

Comments
 (0)