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 2021/04/21 06:04:22 UTC

[camel-k] branch main updated (9bcd7c8 -> f4ac5b3)

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

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


    from 9bcd7c8  Moving from master branch to main
     new e53bf48  Moving from master branch to main
     new 39f8ee2  Moving from master branch to main
     new f4ac5b3  Moving from master branch to main

The 3 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:
 helm/camel-k/Chart.yaml     | 2 +-
 script/bundle_kamelets.sh   | 2 +-
 script/gen_release_notes.sh | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

[camel-k] 01/03: Moving from master branch to main

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit e53bf489923c6c168f4cd8a3e0ae8da4f5784423
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 21 08:01:22 2021 +0200

    Moving from master branch to main
---
 script/bundle_kamelets.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/bundle_kamelets.sh b/script/bundle_kamelets.sh
index b54a9d5..9f2c417 100755
--- a/script/bundle_kamelets.sh
+++ b/script/bundle_kamelets.sh
@@ -35,7 +35,7 @@ if [ "$repo" = "" ]; then
 fi
 
 if [ "$branch" = "" ]; then
-  branch="master"
+  branch="main"
 fi
 
 echo "Cloning repository $repo on branch $branch to bundle kamelets..."

[camel-k] 03/03: Moving from master branch to main

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit f4ac5b3d559f5b5eef2a58020865dcc971984645
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 21 08:03:32 2021 +0200

    Moving from master branch to main
---
 helm/camel-k/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml
index 443289c..6ebc846 100644
--- a/helm/camel-k/Chart.yaml
+++ b/helm/camel-k/Chart.yaml
@@ -37,7 +37,7 @@ version: 0.6.0
 # incremented each time you make changes to the application.
 appVersion: 1.4.0-SNAPSHOT
 
-icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png
+icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png
 home: https://camel.apache.org/camel-k/latest/
 
 sources:

[camel-k] 02/03: Moving from master branch to main

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 39f8ee2341a85806d74058058a786f14739f694c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 21 08:02:10 2021 +0200

    Moving from master branch to main
---
 script/gen_release_notes.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/gen_release_notes.sh b/script/gen_release_notes.sh
index 070e08d..c00e520 100755
--- a/script/gen_release_notes.sh
+++ b/script/gen_release_notes.sh
@@ -38,12 +38,12 @@ echo "Using start SHA $start_sha from tag $last_tag"
 set +e
 end_sha=$(git rev-list -n 1 $new_tag 2>&1)
 if [ $? -ne 0 ]; then
-	end_sha=$(git rev-parse upstream/master)
+	end_sha=$(git rev-parse upstream/main)
     if [ "$end_sha" == "" ]; then
     	echo "cannot determine current SHA from git"
     	exit 1
     fi
-    echo "Using end SHA $end_sha from upstream/master"
+    echo "Using end SHA $end_sha from upstream/main"
 else
 	echo "Using end SHA $end_sha from tag $new_tag"
 fi