You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/01/23 07:54:17 UTC
[camel-k] branch master updated (4c5c963 -> 7ffcd69)

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

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.


    from 4c5c963  chore(trait): Use container args to configure Prometheus agent
     new 9bf1664  Fix #1093: document how to update multiple trait properties
     new 8aa6dc8  chore(lint): increase timeout to 10m
     new 7ffcd69  Merge pull request #1218 from nicolaferraro/trait

The 1324 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 cmd/util/doc-gen/generators/traitdocgen.go          | 6 +++++-
 docs/modules/ROOT/pages/traits/affinity.adoc        | 2 +-
 docs/modules/ROOT/pages/traits/builder.adoc         | 2 +-
 docs/modules/ROOT/pages/traits/camel.adoc           | 2 +-
 docs/modules/ROOT/pages/traits/container.adoc       | 2 +-
 docs/modules/ROOT/pages/traits/deployer.adoc        | 2 +-
 docs/modules/ROOT/pages/traits/deployment.adoc      | 2 +-
 docs/modules/ROOT/pages/traits/environment.adoc     | 2 +-
 docs/modules/ROOT/pages/traits/gc.adoc              | 2 +-
 docs/modules/ROOT/pages/traits/ingress.adoc         | 2 +-
 docs/modules/ROOT/pages/traits/istio.adoc           | 2 +-
 docs/modules/ROOT/pages/traits/jolokia.adoc         | 2 +-
 docs/modules/ROOT/pages/traits/knative-service.adoc | 2 +-
 docs/modules/ROOT/pages/traits/knative.adoc         | 2 +-
 docs/modules/ROOT/pages/traits/owner.adoc           | 2 +-
 docs/modules/ROOT/pages/traits/platform.adoc        | 2 +-
 docs/modules/ROOT/pages/traits/probes.adoc          | 2 +-
 docs/modules/ROOT/pages/traits/prometheus.adoc      | 2 +-
 docs/modules/ROOT/pages/traits/pull-secret.adoc     | 2 +-
 docs/modules/ROOT/pages/traits/quarkus.adoc         | 2 +-
 docs/modules/ROOT/pages/traits/route.adoc           | 2 +-
 docs/modules/ROOT/pages/traits/service.adoc         | 2 +-
 script/Makefile                                     | 2 +-
 23 files changed, 27 insertions(+), 23 deletions(-)