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/03/17 16:06:56 UTC

[camel-k] branch issue-1350 updated (d25005a -> d513b8d)

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

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


 discard d25005a  Fixes #1350 Remove human-readable format from timer period computation in cron trait
     add b7ec6ae  Fix #1325: add 3scale addon
     add f65e131  Fixes #1350 Remove human-readable format from timer period computation in cron trait
     add 3a0ce48  Fixes #1350 Remove human-readable format from timer period computation in cron trait, e2e tests
     add 6d46dab  Fixes #1350 Remove human-readable format from timer period computation in cron trait, examples
     add a47410d  Fixes #1350 Remove human-readable format from timer period computation in cron trait, templates
     add d513b8d  Fixes #1350 Remove human-readable format from timer period computation in cron trait, more tests

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (d25005a)
            \
             N -- N -- N   refs/heads/issue-1350 (d513b8d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 addons/{register_master.go => register_3scale.go} |   4 +-
 addons/threescale/3scale.go                       | 138 ++++++++++++++++++++++
 addons/threescale/3scale_test.go                  | 114 ++++++++++++++++++
 addons/threescale/zz_generated_doc.go             |   1 +
 deploy/resources.go                               |  32 ++---
 deploy/templates/groovy.tmpl                      |   2 +-
 deploy/templates/java.tmpl                        |   2 +-
 deploy/templates/js.tmpl                          |   2 +-
 deploy/templates/kts.tmpl                         |   2 +-
 deploy/templates/xml.tmpl                         |   2 +-
 deploy/templates/yaml.tmpl                        |   2 +-
 docs/modules/ROOT/nav.adoc                        |   3 +-
 docs/modules/ROOT/pages/traits/3scale.adoc        |  52 ++++++++
 docs/modules/ROOT/pages/traits/container.adoc     |  59 +++++++++
 docs/modules/ROOT/pages/traits/openapi.adoc       |   4 +-
 docs/modules/ROOT/pages/traits/traits.adoc        |   3 +-
 e2e/files/cron-timer.groovy                       |   2 +-
 e2e/files/groovy.groovy                           |   2 +-
 e2e/files/js-polyglot.js                          |   4 +-
 e2e/files/js.js                                   |   4 +-
 e2e/files/kotlin.kts                              |   2 +-
 e2e/files/xml.xml                                 |   2 +-
 examples/AMQPBindToRegistry.java                  |   4 +-
 examples/Master.java                              |   2 +-
 examples/amqp.groovy                              |   4 +-
 examples/amqp.js                                  |   4 +-
 examples/dns.js                                   |   2 +-
 examples/hello.xml                                |   2 +-
 examples/knative/README.adoc                      |   2 +-
 examples/knative/feed.groovy                      |   4 +-
 examples/knative/writer.groovy                    |   4 +-
 examples/kotlin-routes.kts                        |   4 +-
 examples/polyglot/routes.xml                      |   2 +-
 examples/props.js                                 |   4 +-
 examples/routes.groovy                            |   2 +-
 examples/routes.js                                |   4 +-
 examples/routes.yaml                              |   2 +-
 examples/saga/Saga.java                           |   2 +-
 examples/simple.groovy                            |   2 +-
 examples/simple.js                                |   4 +-
 examples/tekton/hello.groovy                      |   2 +-
 pkg/cmd/run.go                                    |   2 +-
 pkg/metadata/metadata_uri_test.go                 |  22 ++--
 pkg/util/uri/uri_test.go                          |  14 +--
 44 files changed, 445 insertions(+), 87 deletions(-)
 copy addons/{register_master.go => register_3scale.go} (89%)
 create mode 100644 addons/threescale/3scale.go
 create mode 100644 addons/threescale/3scale_test.go
 create mode 100644 addons/threescale/zz_generated_doc.go
 create mode 100755 docs/modules/ROOT/pages/traits/3scale.adoc