mirror of
https://github.com/kyverno/kyverno.git
synced 2025-03-29 10:55:05 +00:00
Merge branch 'master' of github.com:nirmata/kyverno
# Conflicts: # gh-pages/config.toml # gh-pages/content/features.md
This commit is contained in:
commit
9a360ea768
2 changed files with 10 additions and 5 deletions
|
@ -1,4 +1,4 @@
|
|||
baseURL = "https://nirmata.github.io/kube-policy/"
|
||||
baseURL = "https://nirmata.github.io/kyverno/"
|
||||
themesDir = "themes"
|
||||
theme = "github-project-landing-page"
|
||||
title = "Kyverno"
|
||||
|
@ -13,10 +13,10 @@ relativeURLs=true
|
|||
and wildcards. View policy results as events, and policy violations as events or
|
||||
in policy status.'''
|
||||
author_name = "Nirmata"
|
||||
author_url = "http://nirmata.com"
|
||||
project_url = "http://github.com/nirmata/kyverno/"
|
||||
project_documentation = "http://github.com/nirmata/kyverno/docs"
|
||||
github_project_name = "kube-policy"
|
||||
author_url = "https://nirmata.com"
|
||||
project_url = "https://github.com/nirmata/kyverno/"
|
||||
project_documentation = "https://github.com/nirmata/kyverno/blob/master/README.md"
|
||||
github_project_name = "kyverno"
|
||||
github_user_name = "nirmata"
|
||||
logo = "img/kyverno.png"
|
||||
|
||||
|
|
|
@ -19,6 +19,11 @@
|
|||
* Test policy changes using kubectl
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
<p style="margin-top: 30px; margin-left:15px; font-size: 125%;">
|
||||
Ready for more? <a href="https://github.com/nirmata/kyverno/blob/master/README.md">Read the docs</a>, <a href="https://github.com/nirmata/kyverno/blob/master/README.md">write a policy</a>, or <a href="https://github.com/nirmata/kyverno/blob/master/README.md">try Kyverno in your cluster</a>!
|
||||
=======
|
||||
<p style="margin-top: 30px; margin-left:15px; font-size: 110%;">
|
||||
Ready for more? <a href="https://github.com/nirmata/kyverno/blob/master/README.md">Read the docs</a>, <a href="https://github.com/nirmata/kyverno/blob/master/documentation/writing-policies.md">write a policy</a>, or <a href="https://github.com/nirmata/kyverno/blob/master/documentation/installation.md">try Kyverno in your cluster</a>!
|
||||
>>>>>>> 5ef9b86400eb026bb3fdcda3a4f80f94c938e31f
|
||||
</p>
|
Loading…
Add table
Reference in a new issue