This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/main by this push: new 7b3ecd2 NO-JIRA: update various references after branches renamed to main 7b3ecd2 is described below commit 7b3ecd2ae3da07f180aa31f53c30406238d94728 Author: Robbie Gemmell <rob...@apache.org> AuthorDate: Wed Mar 31 12:14:15 2021 +0100 NO-JIRA: update various references after branches renamed to main --- Dockerfile | 2 +- dockerfiles/Dockerfile-fedora | 2 +- dockerfiles/Dockerfile-fedora-only-python3 | 2 +- dockerfiles/Dockerfile-ubuntu | 2 +- docs/notes/contrib-guide.adoc | 12 ++++++------ src/router_core/connections.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0dd28d7..00dcd9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,7 @@ FROM centos:7 MAINTAINER "d...@qpid.apache.org" -# Install all the required packages. Some in this list were picked off from proton's INSTALL.md (https://github.com/apache/qpid-proton/blob/master/INSTALL.md) and the rest are from dispatch (https://github.com/apache/qpid-dispatch/blob/master/README) +# Install all the required packages. Some in this list were picked off from proton's INSTALL.md (https://github.com/apache/qpid-proton/blob/main/INSTALL.md) and the rest are from dispatch (https://github.com/apache/qpid-dispatch/blob/main/README) # For centos, some packages are found in the epel repo, so first install access to it RUN yum -y install epel-release diff --git a/dockerfiles/Dockerfile-fedora b/dockerfiles/Dockerfile-fedora index c676644..82cd362 100644 --- a/dockerfiles/Dockerfile-fedora +++ b/dockerfiles/Dockerfile-fedora @@ -29,7 +29,7 @@ FROM fedora:latest MAINTAINER "d...@qpid.apache.org" -# Install required packages. Some in this list are from proton's INSTALL.md (https://github.com/apache/qpid-proton/blob/master/INSTALL.md) and the rest are from dispatch (https://github.com/apache/qpid-dispatch/blob/master/README) +# Install required packages. Some in this list are from proton's INSTALL.md (https://github.com/apache/qpid-proton/blob/main/INSTALL.md) and the rest are from dispatch (https://github.com/apache/qpid-dispatch/blob/main/README) RUN dnf -y install gcc gcc-c++ cmake openssl-devel cyrus-sasl-devel cyrus-sasl-plain cyrus-sasl-gssapi cyrus-sasl-md5 swig java-1.8.0-openjdk-devel git make valgrind emacs libwebsockets-devel python-devel libnghttp2-devel curl RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py diff --git a/dockerfiles/Dockerfile-fedora-only-python3 b/dockerfiles/Dockerfile-fedora-only-python3 index 9ed7590..3d4c8db 100644 --- a/dockerfiles/Dockerfile-fedora-only-python3 +++ b/dockerfiles/Dockerfile-fedora-only-python3 @@ -29,7 +29,7 @@ FROM fedora:latest MAINTAINER "d...@qpid.apache.org" -# Install all the required packages. Some in this list were picked off from proton's INSTALL.md (https://github.com/apache/qpid-proton/blob/master/INSTALL.md) and the rest are from dispatch (https://github.com/apache/qpid-dispatch/blob/master/README) +# Install all the required packages. Some in this list were picked off from proton's INSTALL.md (https://github.com/apache/qpid-proton/blob/main/INSTALL.md) and the rest are from dispatch (https://github.com/apache/qpid-dispatch/blob/main/README) RUN dnf -y install gcc cmake libuuid-devel openssl-devel cyrus-sasl-devel cyrus-sasl-plain cyrus-sasl-gssapi cyrus-sasl-md5 swig java-1.8.0-openjdk-devel git make doxygen valgrind emacs libuv libuv-devel libwebsockets-devel # Remove python2 if it is already there. We want this environment to contain only python3 diff --git a/dockerfiles/Dockerfile-ubuntu b/dockerfiles/Dockerfile-ubuntu index 8b9dfb7..7e11984 100644 --- a/dockerfiles/Dockerfile-ubuntu +++ b/dockerfiles/Dockerfile-ubuntu @@ -24,7 +24,7 @@ FROM ubuntu:latest MAINTAINER "d...@qpid.apache.org" ARG DEBIAN_FRONTEND=noninteractive -# Install all the required packages. Some in this list were picked off from proton's INSTALL.md (https://github.com/apache/qpid-proton/blob/master/INSTALL.md) and the rest are from dispatch (https://github.com/apache/qpid-dispatch/blob/master/README) +# Install all the required packages. Some in this list were picked off from proton's INSTALL.md (https://github.com/apache/qpid-proton/blob/main/INSTALL.md) and the rest are from dispatch (https://github.com/apache/qpid-dispatch/blob/main/README) RUN apt-get update && \ apt-get install -y curl gcc g++ automake libwebsockets-dev libtool zlib1g-dev cmake libsasl2-dev libssl-dev libnghttp2-dev python3-dev libuv1-dev sasl2-bin swig maven git && \ apt-get -y clean diff --git a/docs/notes/contrib-guide.adoc b/docs/notes/contrib-guide.adoc index 9137052..c8035d9 100644 --- a/docs/notes/contrib-guide.adoc +++ b/docs/notes/contrib-guide.adoc @@ -101,11 +101,11 @@ Updating the documentation involves fetching the latest code from the upstream r . Update your local repo with the latest changes from the upstream repository: -.. Check out the master branch locally. +.. Check out the main branch locally. + [source,bash,options="nowrap"] ---- -$ git checkout master +$ git checkout main ---- .. Fetch the current files from the upstream repository. @@ -115,18 +115,18 @@ $ git checkout master $ git fetch upstream ---- -.. Update your cloned master branch on your local machine with the current files from the upstream repository: +.. Update your cloned main branch on your local machine with the current files from the upstream repository: + [source,bash,options="nowrap"] ---- -$ git rebase upstream/master +$ git rebase upstream/main ---- .. Update your fork in GitHub (`origin`) with the current files from the upstream repository. + [source,bash,options="nowrap"] ---- -$ git push origin master +$ git push origin main ---- . If there is not a JIRA for your documentation update, create one in the link:https://issues.apache.org/jira/projects/DISPATCH[Apache Dispatch JIRA project]. @@ -143,7 +143,7 @@ When you create the JIRA: -- [source,bash,options="nowrap",subs="+quotes"] ---- -$ git checkout -b _<branch-name>_ upstream/master +$ git checkout -b _<branch-name>_ upstream/main ---- The branch name should include the ID of the JIRA for which you are creating the documentation update. -- diff --git a/src/router_core/connections.c b/src/router_core/connections.c index eb7701c..782eda6 100644 --- a/src/router_core/connections.c +++ b/src/router_core/connections.c @@ -961,7 +961,7 @@ static void qdr_link_abort_undelivered_CT(qdr_core_t *core, qdr_link_t *link) static void qdr_link_cleanup_CT(qdr_core_t *core, qdr_connection_t *conn, qdr_link_t *link, const char *log_text) { // - // Remove the link from the master list of links and possibly the streaming + // Remove the link from the overall list of links and possibly the streaming // link pool // DEQ_REMOVE(core->open_links, link); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org