Skip to content

Commit e23561e

Browse files
committed
Fix merge conflict between new tests and default min svn bump
1 parent 128dd90 commit e23561e

File tree

69 files changed

+72
-259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+72
-259
lines changed

src/confcom/samples/aci/command/policy.rego

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fragments := [
1414
"fragments"
1515
],
1616
"issuer": "did:x509:0:sha256:I__iuL25oXEVFdTP_aBLx_eT1RPHbCQ_ECBQfYZpt9s::eku:1.3.6.1.4.1.311.76.59.1.3",
17-
"minimum_svn": "1"
17+
"minimum_svn": "4"
1818
}
1919
]
2020

src/confcom/samples/aci/command/policy_debug.rego

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fragments := [
1414
"fragments"
1515
],
1616
"issuer": "did:x509:0:sha256:I__iuL25oXEVFdTP_aBLx_eT1RPHbCQ_ECBQfYZpt9s::eku:1.3.6.1.4.1.311.76.59.1.3",
17-
"minimum_svn": "1"
17+
"minimum_svn": "4"
1818
}
1919
]
2020

src/confcom/samples/aci/command/policy_disable_stdio.rego

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fragments := [
1414
"fragments"
1515
],
1616
"issuer": "did:x509:0:sha256:I__iuL25oXEVFdTP_aBLx_eT1RPHbCQ_ECBQfYZpt9s::eku:1.3.6.1.4.1.311.76.59.1.3",
17-
"minimum_svn": "1"
17+
"minimum_svn": "4"
1818
}
1919
]
2020

src/confcom/samples/aci/command/policy_fragment.rego

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fragments := [
1414
"fragments"
1515
],
1616
"issuer": "did:x509:0:sha256:I__iuL25oXEVFdTP_aBLx_eT1RPHbCQ_ECBQfYZpt9s::eku:1.3.6.1.4.1.311.76.59.1.3",
17-
"minimum_svn": "1"
17+
"minimum_svn": "4"
1818
},
1919
{
2020
"feed": "mcr.microsoft.com/acc/samples/aci/helloworld",

src/confcom/samples/aci/conflicting_variables/policy.rego

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fragments := [
1414
"fragments"
1515
],
1616
"issuer": "did:x509:0:sha256:I__iuL25oXEVFdTP_aBLx_eT1RPHbCQ_ECBQfYZpt9s::eku:1.3.6.1.4.1.311.76.59.1.3",
17-
"minimum_svn": "1"
17+
"minimum_svn": "4"
1818
}
1919
]
2020

src/confcom/samples/aci/conflicting_variables/policy_debug.rego

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fragments := [
1414
"fragments"
1515
],
1616
"issuer": "did:x509:0:sha256:I__iuL25oXEVFdTP_aBLx_eT1RPHbCQ_ECBQfYZpt9s::eku:1.3.6.1.4.1.311.76.59.1.3",
17-
"minimum_svn": "1"
17+
"minimum_svn": "4"
1818
}
1919
]
2020

src/confcom/samples/aci/conflicting_variables/policy_disable_stdio.rego

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fragments := [
1414
"fragments"
1515
],
1616
"issuer": "did:x509:0:sha256:I__iuL25oXEVFdTP_aBLx_eT1RPHbCQ_ECBQfYZpt9s::eku:1.3.6.1.4.1.311.76.59.1.3",
17-
"minimum_svn": "1"
17+
"minimum_svn": "4"
1818
}
1919
]
2020

src/confcom/samples/aci/conflicting_variables/policy_fragment.rego

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fragments := [
1414
"fragments"
1515
],
1616
"issuer": "did:x509:0:sha256:I__iuL25oXEVFdTP_aBLx_eT1RPHbCQ_ECBQfYZpt9s::eku:1.3.6.1.4.1.311.76.59.1.3",
17-
"minimum_svn": "1"
17+
"minimum_svn": "4"
1818
},
1919
{
2020
"feed": "mcr.microsoft.com/acc/samples/aci/helloworld",

src/confcom/samples/aci/container_group_profiles/policy.rego

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fragments := [
1414
"fragments"
1515
],
1616
"issuer": "did:x509:0:sha256:I__iuL25oXEVFdTP_aBLx_eT1RPHbCQ_ECBQfYZpt9s::eku:1.3.6.1.4.1.311.76.59.1.3",
17-
"minimum_svn": "1"
17+
"minimum_svn": "4"
1818
}
1919
]
2020

src/confcom/samples/aci/container_group_profiles/policy_debug.rego

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fragments := [
1414
"fragments"
1515
],
1616
"issuer": "did:x509:0:sha256:I__iuL25oXEVFdTP_aBLx_eT1RPHbCQ_ECBQfYZpt9s::eku:1.3.6.1.4.1.311.76.59.1.3",
17-
"minimum_svn": "1"
17+
"minimum_svn": "4"
1818
}
1919
]
2020

0 commit comments

Comments
 (0)