Skip to content

Commit fa48887

Browse files
committed
Merge branch 'main' of github.com:fortanix/terraform-provider-dsm into release/v0.5.27
All conflicts fixed but you are still merging. Resolving conflicts Changes to be committed: modified: ../../Makefile modified: dsm_aws_sobject.md modified: dsm_sobject.md
2 parents b3ff431 + 8b04e0b commit fa48887

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ HOSTNAME=fortanix.com
44
NAMESPACE=fortanix
55
NAME=dsm
66
BINARY=terraform-provider-${NAME}
7-
VERSION=0.5.26
7+
VERSION=0.5.27
88
OS=linux
99
ARCH=amd64
1010
OS_ARCH=${OS}_${ARCH}

docs/resources/dsm_aws_sobject.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ Only one of the following attributes should be used while configuring the interv
6565
1. interval_days
6666
2. interval_months
6767

68-
6968
## Attribute Reference
7069

7170
The following attributes are stored in the `dsm_aws_sobject` resource block:

docs/resources/dsm_sobject.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ Only one of the following attributes should be used while configuring the interv
7777
1. interval_days
7878
2. interval_months
7979

80-
81-
8280
## Attribute Reference
8381

8482
The following attributes are stored in the `dsm_sobject` resource block:
@@ -110,4 +108,4 @@ The following attributes are stored in the `dsm_sobject` resource block:
110108

111109
* _**hash\_alg**_ = Hashing Algorithm for KCDSA and ECKCDSA. The allowed Hashing Algorithms are `SHA1`,`SHA224`, `SHA256`, `SHA384`, `SHA521`.
112110
* _**subgroup\_size**_ = Subgroup Size for DSA and ECKCDSA. The allowed Subgroup Sizes are `224` and `256`
113-
* _**rotation\_policy**_ = Policy to rotate a security object
111+
* _**rotation\_policy**_ = Policy to rotate a security object

0 commit comments

Comments
 (0)