forked from vmware-archive/admiral
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Convert to all text files from CRLF to LF
Change-Id: I44cb48345c0a0f0f3725e0e810cb9074dc6f4e8b Reviewed-on: http://bellevue-ci.eng.vmware.com:8080/13683 Reviewed-by: Jose Dillet <[email protected]> Compute-Verified: jenkins <[email protected]> Upgrade-Verified: jenkins <[email protected]> Closures-Verified: jenkins <[email protected]> Bellevue-Verified: jenkins <[email protected]> Reviewed-by: Boris Savov <[email protected]> CS-Verified: jenkins <[email protected]>
- Loading branch information
George Dimitrov
committed
Jul 20, 2017
1 parent
0cccc39
commit 5b93c65
Showing
14 changed files
with
9,501 additions
and
9,499 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # Auto detect text files and perform LF normalization | ||
| * text=auto |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| NOTICE | ||
| Admiral 1.1.1 | ||
| Copyright (c) 2017 VMware, Inc. All Rights Reserved. | ||
| This product is licensed to you under the Apache License, Version 2.0 (the "License"). You may not use this product except in compliance with the License. | ||
| This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. | ||
| NOTICE | ||
|
|
||
| Admiral 1.1.1 | ||
|
|
||
| Copyright (c) 2017 VMware, Inc. All Rights Reserved. | ||
|
|
||
| This product is licensed to you under the Apache License, Version 2.0 (the "License"). You may not use this product except in compliance with the License. | ||
|
|
||
| This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. | ||
|
|
596 changes: 298 additions & 298 deletions
596
compute/src/main/java/com/vmware/admiral/compute/container/HostPortProfileService.java
Large diffs are not rendered by default.
Oops, something went wrong.
66 changes: 33 additions & 33 deletions
66
compute/src/main/java/com/vmware/admiral/compute/content/StringEncodedConstraint.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,33 @@ | ||
| /* | ||
| * Copyright (c) 2017 VMware, Inc. All Rights Reserved. | ||
| * | ||
| * This product is licensed to you under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this product except in compliance with the License. | ||
| * | ||
| * This product may include a number of subcomponents with separate copyright notices | ||
| * and license terms. Your use of these subcomponents is subject to the terms and | ||
| * conditions of the subcomponent's license, as noted in the LICENSE file. | ||
| */ | ||
|
|
||
| package com.vmware.admiral.compute.content; | ||
|
|
||
| /** | ||
| * Definition of a constraint to be used in the template instead of the more complex | ||
| * underlying {@link com.vmware.photon.controller.model.Constraint}/{@link com.vmware.photon.controller.model.Constraint.Condition} structure. | ||
| * | ||
| * This allows for yaml declaration like this: | ||
| * <pre> | ||
| * constraints: | ||
| * - tag: "!location:eu:hard" | ||
| * - tag: "location:us:soft" | ||
| * - tag: "!windows" | ||
| * </pre> | ||
| */ | ||
| public class StringEncodedConstraint { | ||
| /** | ||
| * Defines a tag constraint in a single string in the following format: | ||
| * | ||
| * {@code [!]tagKey[:tagValue]:[soft|hard]} | ||
| */ | ||
| public String tag; | ||
| } | ||
| /* | ||
| * Copyright (c) 2017 VMware, Inc. All Rights Reserved. | ||
| * | ||
| * This product is licensed to you under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this product except in compliance with the License. | ||
| * | ||
| * This product may include a number of subcomponents with separate copyright notices | ||
| * and license terms. Your use of these subcomponents is subject to the terms and | ||
| * conditions of the subcomponent's license, as noted in the LICENSE file. | ||
| */ | ||
|
|
||
| package com.vmware.admiral.compute.content; | ||
|
|
||
| /** | ||
| * Definition of a constraint to be used in the template instead of the more complex | ||
| * underlying {@link com.vmware.photon.controller.model.Constraint}/{@link com.vmware.photon.controller.model.Constraint.Condition} structure. | ||
| * | ||
| * This allows for yaml declaration like this: | ||
| * <pre> | ||
| * constraints: | ||
| * - tag: "!location:eu:hard" | ||
| * - tag: "location:us:soft" | ||
| * - tag: "!windows" | ||
| * </pre> | ||
| */ | ||
| public class StringEncodedConstraint { | ||
| /** | ||
| * Defines a tag constraint in a single string in the following format: | ||
| * | ||
| * {@code [!]tagKey[:tagValue]:[soft|hard]} | ||
| */ | ||
| public String tag; | ||
| } |
Oops, something went wrong.