This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new eff245c Updated CHANGELOG.md
eff245c is described below
commit eff245cea8149db0729d7ba67097b11c3f13aacc
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Dec 16 03:19:09 2020 +0000
Updated CHANGELOG.md
---
CHANGELOG.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d18f9aa..4f41474 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
**Merged pull requests:**
- chore\(doc\): generate doc for environment trait
[\#1858](https://github.com/apache/camel-k/pull/1858)
([tadayosi](https://github.com/tadayosi))
+- Prioritize user properties over modeline properties.
[\#1857](https://github.com/apache/camel-k/pull/1857)
([doru1004](https://github.com/doru1004))
- chore\(test\): test that propertyless kamelets can be bound
[\#1856](https://github.com/apache/camel-k/pull/1856)
([nicolaferraro](https://github.com/nicolaferraro))
- chore\(api\): make KameletSpec.Definition a pointer so it can be omitted
[\#1855](https://github.com/apache/camel-k/pull/1855)
([lburgazzoli](https://github.com/lburgazzoli))
- chore\(crd\): Regenerate KameletBinding CRD
[\#1854](https://github.com/apache/camel-k/pull/1854)
([astefanutti](https://github.com/astefanutti))
@@ -339,6 +340,7 @@
- Switch to Syndesis backport github action
[\#1560](https://github.com/apache/camel-k/pull/1560)
([oscerd](https://github.com/oscerd))
- fix\(jvm\): Integration do not shutdown gracefully when jvm.print-command is
set [\#1558](https://github.com/apache/camel-k/pull/1558)
([astefanutti](https://github.com/astefanutti))
- fix\(util\): line break after "Monitoring pod ..." message
[\#1554](https://github.com/apache/camel-k/pull/1554)
([tadayosi](https://github.com/tadayosi))
+- fix: bug in utility function
[\#1553](https://github.com/apache/camel-k/pull/1553)
([nicolaferraro](https://github.com/nicolaferraro))
- support make install-crc \#1410
[\#1544](https://github.com/apache/camel-k/pull/1544)
([johnpoth](https://github.com/johnpoth))
- Cannot expose knative endpoints in YAML
[\#1540](https://github.com/apache/camel-k/pull/1540)
([lburgazzoli](https://github.com/lburgazzoli))
- chore: add a backport action
[\#1531](https://github.com/apache/camel-k/pull/1531)
([nicolaferraro](https://github.com/nicolaferraro))
@@ -386,7 +388,6 @@
**Merged pull requests:**
-- fix: bug in utility function
[\#1553](https://github.com/apache/camel-k/pull/1553)
([nicolaferraro](https://github.com/nicolaferraro))
- \#1524 set the OLM channel used on install to 'stable'
[\#1532](https://github.com/apache/camel-k/pull/1532)
([oscerd](https://github.com/oscerd))
- fix: JVM trait overrides other traits JVM arguments
[\#1529](https://github.com/apache/camel-k/pull/1529)
([astefanutti](https://github.com/astefanutti))
- Backport fix for \#1511 in release-1.0.x
[\#1520](https://github.com/apache/camel-k/pull/1520)
([nicolaferraro](https://github.com/nicolaferraro))
