This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit e7523a4376699e8261c648297d1564bd8e8b3883
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Sep 29 14:43:27 2022 +0200

    Regen
---
 pkg/resources/resources.go | 4 ++--
 resources/traits.yaml      | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 45fcd718f..c938b7362 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -611,9 +611,9 @@ var assets = func() http.FileSystem {
                "/traits.yaml": &vfsgen۰CompressedFileInfo{
                        name:             "traits.yaml",
                        modTime:          time.Time{},
-                       uncompressedSize: 54492,
+                       uncompressedSize: 55879,
 
-                       compressedContent: 
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7d\x73\x1b\xb9\xd1\x20\xfe\xff\x7e\x0a\x94\xf2\x7b\x4a\x92\x8b\xa4\xb4\x9b\x67\x93\xfd\xe9\xce\x4f\x4e\x6b\x7b\x13\xed\xfa\x45\x67\x69\x37\x4f\xca\xe7\x0a\xc1\x19\x90\x84\x39\x03\x4c\x00\x8c\x64\xee\xe5\xbe\xfb\x15\xba\x1b\x2f\x33\x1c\x8a\x94\x6d\xed\x45\x57\x97\xad\x8a\x45\x72\xa6\xd1\x68\x34\x1a\xfd\x0e\x67\xb8\x74\xf6\xec\xab\x31\x53\xbc\x16\x67\xec\xf7\xb6\xe0\x95\xf8\x8a\xb1\xa6\xe2\x6e\xae\x4d\x7d\xc6\x
 [...]
+                       compressedContent: 
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7b\x73\x1c\x37\x92\x20\xfe\xbf\x3f\x05\x82\xfb\xdb\x20\xa9\xe8\x6e\xd2\x9e\xf5\xac\x7f\xbc\xd3\xce\xd1\x92\xec\xa1\xad\x07\x4f\xa4\x3d\x3b\xa1\x53\x4c\xa3\xab\xd0\xdd\x50\x57\x01\x35\x00\x8a\x54\xfb\xf6\xbe\xfb\x05\x32\x13\x8f\xaa\xae\x66\x37\x25\xd1\x37\xbc\xbd\x9d\x88\xb5\x48\x16\x80\x44\x22\x91\xc8\x77\x3a\xc3\xa5\xb3\x67\x5f\x8d\x99\xe2\xb5\x38\x63\x7f\xb0\x05\xaf\xc4\x57\x8c\x35\x15\x77\x73\x6d\xea\x33\x
 [...]
                },
        }
        fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
diff --git a/resources/traits.yaml b/resources/traits.yaml
index 63219a939..812ff3475 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -474,7 +474,6 @@ traits:
     type: bool
     description: Define if we want to use the Default Instance approach for 
accessing
       the Google Secret Manager service
->>>>>>> 086b55a6 (Added docs about GCP Secret Manager Vault Trait)
 - name: health
   platform: false
   profiles:

Reply via email to