You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@streampipes.apache.org by wi...@apache.org on 2020/11/25 22:21:40 UTC

[incubator-streampipes] 03/05: Merge branch 'dev' into edge-extensions

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

wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit 8542f29c08cb19a4a46d74c998b20b674a88cc14
Merge: 3c4892f bbfddd9
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Tue Nov 24 13:59:11 2020 +0100

    Merge branch 'dev' into edge-extensions

 .idea/runConfigurations/connect_adapters.xml                            | 2 +-
 .../connect/container/worker/management/MasterRestClient.java           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)