From 81a5711b6db4dedb1d151d39464f326be80e2285 Mon Sep 17 00:00:00 2001
From: Fred Hebert <mononcqc@ferd.ca>
Date: Wed, 22 Nov 2017 14:55:21 -0500
Subject: [PATCH] Bump to 3.4.7

---
 bootstrap         | 2 +-
 pr2relnotes.sh    | 2 +-
 src/rebar.app.src | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootstrap b/bootstrap
index bd9535bd5..431faade9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -24,7 +24,7 @@ main(_) ->
     bootstrap_rebar3(),
 
     %% Build rebar.app from rebar.app.src
-    {ok, App} = rebar_app_info:new(rebar, "3.4.6", filename:absname("_build/default/lib/rebar/")),
+    {ok, App} = rebar_app_info:new(rebar, "3.4.7", filename:absname("_build/default/lib/rebar/")),
     rebar_otp_app:compile(rebar_state:new(), App),
 
     %% Because we are compiling files that are loaded already we want to silence
diff --git a/pr2relnotes.sh b/pr2relnotes.sh
index 28712bb0a..9049e82ba 100755
--- a/pr2relnotes.sh
+++ b/pr2relnotes.sh
@@ -13,7 +13,7 @@ awk -v url=$url '
     /^commit / {mode="new"}
 
     # merge commit default message
-    / +Merge pull request/ {
+    mode=="new" && / +Merge pull request/ {
         page_id=substr($4, 2, length($4)-1);
         mode="started";
         next;
diff --git a/src/rebar.app.src b/src/rebar.app.src
index 74efe97fe..ae5afcaae 100644
--- a/src/rebar.app.src
+++ b/src/rebar.app.src
@@ -3,7 +3,7 @@
 
 {application, rebar,
  [{description, "Rebar: Erlang Build Tool"},
-  {vsn, "git"},
+  {vsn, "3.4.7"},
   {modules, []},
   {registered, []},
   {applications, [kernel,