From 2d077d99e7bfbce30642db21f0cecaee7a522fc5 Mon Sep 17 00:00:00 2001
From: Nicolas Grilly <nicolas@gardentechno.com>
Date: Mon, 21 Mar 2016 13:09:19 +0100
Subject: [PATCH 1/2] Fix Travis by upgrading to Go 1.6 (which includes cover)

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ec59845..e0d02a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,14 +2,13 @@ sudo: false
 
 language: go
 go:
-  - 1.3.1
+  - 1.6
 
 env:
   global:
     - PATH=$HOME/gopath/bin:$PATH
 
 before_install:
-  - go get code.google.com/p/go.tools/cmd/cover
   - go get github.com/tools/godep
   - godep restore
 

From 9372bb8def205eacf5b5d23bc10776a59031dca4 Mon Sep 17 00:00:00 2001
From: Nicolas Grilly <nicolas@gardentechno.com>
Date: Mon, 21 Mar 2016 12:16:43 +0100
Subject: [PATCH 2/2] Fix restart

---
 start.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/start.go b/start.go
index cc7cde2..b19de75 100644
--- a/start.go
+++ b/start.go
@@ -165,7 +165,9 @@ func (f *Forego) startProcess(idx, procNum int, proc ProcfileEntry, env Env, of
 
 		// Prevent goroutine from exiting before process has finished.
 		defer func() { <-finished }()
-		defer f.teardown.Fall()
+		if !flagRestart {
+			defer f.teardown.Fall()
+		}
 
 		select {
 		case <-finished: