[camel] branch jbang-user-config updated (99c9129a75d -> 0d9cc3af688)

[fm...@apache.org]

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

fmariani pushed a change to branch jbang-user-config
in repository https://gitbox.apache.org/repos/asf/camel.git


 discard 99c9129a75d Merge branch 'jbang-user-config' of github.com:apache/camel into jbang-user-config
     new 0d9cc3af688 Merge branch 'jbang-user-config' of github.com:apache/camel into jbang-user-config

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   (99c9129a75d)
            \
             N -- N -- N   refs/heads/jbang-user-config (0d9cc3af688)

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.

The 1 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:
 .../camel/dsl/jbang/core/commands/Complete.java    |   2 +-
 .../camel/dsl/jbang/core/commands/Export.java      |   2 +-
 .../apache/camel/dsl/jbang/core/commands/Init.java |   2 +-
 .../apache/camel/dsl/jbang/core/commands/Pipe.java |   2 +-
 .../apache/camel/dsl/jbang/core/commands/Run.java  |   4 +-
 .../org/apache/camel/dsl/jbang/BackgroundTest.java | 139 ---------------------
 .../org/apache/camel/dsl/jbang/ConfigTest.java     |  29 -----
 7 files changed, 6 insertions(+), 174 deletions(-)
 delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/BackgroundTest.java
 delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/ConfigTest.java

[camel] 01/01: Merge branch 'jbang-user-config' of github.com:apache/camel into jbang-user-config

[fm...@apache.org]

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

fmariani pushed a commit to branch jbang-user-config
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 0d9cc3af6880d8d448683a9f67fbf1874ccbc8d8
Merge: 81bd09bb346 e850dc1faa5
Author: Croway <fe...@gmail.com>
AuthorDate: Tue Mar 7 18:23:41 2023 +0100

    Merge branch 'jbang-user-config' of github.com:apache/camel into jbang-user-config

 .../camel/dsl/jbang/core/commands/Complete.java    |   2 +-
 .../camel/dsl/jbang/core/commands/Export.java      |   2 +-
 .../apache/camel/dsl/jbang/core/commands/Init.java |   2 +-
 .../apache/camel/dsl/jbang/core/commands/Pipe.java |   2 +-
 .../apache/camel/dsl/jbang/core/commands/Run.java  |   4 +-
 .../org/apache/camel/dsl/jbang/BackgroundTest.java | 139 ---------------------
 6 files changed, 6 insertions(+), 145 deletions(-)