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:56:16 UTC
[camel-k] 01/01: Merge pull request #1352 from apache/issue-1350
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit b91e38d941b1c80a2afa62d3134f1249d338bafb
Merge: b7ec6ae d513b8d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 17 17:56:08 2020 +0100
Merge pull request #1352 from apache/issue-1350
Fixes #1350 Remove human-readable format from timer period computatio…
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 +-
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/metadata/metadata_uri_test.go | 22 +++++++++++-----------
pkg/trait/cron.go | 17 +----------------
pkg/trait/cron_test.go | 26 +++++++++++++-------------
pkg/util/uri/uri_test.go | 14 +++++++-------
36 files changed, 86 insertions(+), 109 deletions(-)