From efa25a3a5612db5cc6e4a20f6bb8ab65654eb042 Mon Sep 17 00:00:00 2001
From: Jeremy Unruh <jeremybunruh@gmail.com>
Date: Wed, 18 May 2016 09:49:36 -0700
Subject: [PATCH 1/3] fix bad merge - issue #38

---
 .../lib/systemd/system/docker-volume-netshare.service      | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/support/systemd/lib/systemd/system/docker-volume-netshare.service b/support/systemd/lib/systemd/system/docker-volume-netshare.service
index 35ef7ac..ba264ec 100644
--- a/support/systemd/lib/systemd/system/docker-volume-netshare.service
+++ b/support/systemd/lib/systemd/system/docker-volume-netshare.service
@@ -1,15 +1,9 @@
 [Unit]
 Description=Docker NFS, AWS EFS & Samba/CIFS Volume Plugin
-<<<<<<< HEAD
-Documentation=https://github.com/ContainX/docker-volume-netshare
-After=nfs-utils.service	docker.service
-Requires=docker.service
-=======
 Documentation=https://github.com/gondor/docker-volume-netshare
 After=nfs-utils.service
 Before=docker.service
 Requires=nfs-utils.service
->>>>>>> b23fe656606d7043631ecf7c5e8f60cbd3185972
 
 
 [Service]
@@ -19,4 +13,3 @@ StandardOutput=syslog
 
 [Install]
 WantedBy=multi-user.target
-

From e6fe450a7964be70fb8ceacc7a6d51a954bddbc3 Mon Sep 17 00:00:00 2001
From: Jeremy Unruh <jeremybunruh@gmail.com>
Date: Wed, 18 May 2016 09:49:59 -0700
Subject: [PATCH 2/3] release 0.17

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 870c437..a789456 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 0.16
+VERSION = 0.17
 GO_FMT = gofmt -s -w -l .
 GO_XC = goxc -os="linux" -tasks-="rmbin" 
 

From abe1e25dc1f458441473fe8427bce524bf2341d3 Mon Sep 17 00:00:00 2001
From: Jeremy Unruh <jeremybunruh@gmail.com>
Date: Wed, 18 May 2016 09:54:39 -0700
Subject: [PATCH 3/3] update release publishing

---
 .goxc.json           | 2 +-
 README.md            | 4 ++--
 netshare/netshare.go | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.goxc.json b/.goxc.json
index 9b1448e..19e3c94 100644
--- a/.goxc.json
+++ b/.goxc.json
@@ -9,7 +9,7 @@
    "subject": "pacesys"
   },
    "publish-github": {
-      "owner": "gondor",
+      "owner": "ContainX",
       "repository": "docker-volume-netshare"
   },
   "debs": {
diff --git a/README.md b/README.md
index d067bcb..51adb71 100644
--- a/README.md
+++ b/README.md
@@ -38,8 +38,8 @@ The method below will install the sysvinit and /etc/default options that can be
 1. Install the Package
 
 ```
-  $ wget https://github.com/ContainX/docker-volume-netshare/releases/download/v0.16/docker-volume-netshare_0.16_amd64.deb
-  $ sudo dpkg -i docker-volume-netshare_0.16_amd64.deb
+  $ wget https://github.com/ContainX/docker-volume-netshare/releases/download/v0.17/docker-volume-netshare_0.17_amd64.deb
+  $ sudo dpkg -i docker-volume-netshare_0.17_amd64.deb
 ```
 
 2. Modify the startup options in `/etc/default/docker-volume-netshare`
diff --git a/netshare/netshare.go b/netshare/netshare.go
index 008656d..adf3a02 100644
--- a/netshare/netshare.go
+++ b/netshare/netshare.go
@@ -2,9 +2,9 @@ package netshare
 
 import (
 	"fmt"
+	"github.com/ContainX/docker-volume-netshare/netshare/drivers"
 	log "github.com/Sirupsen/logrus"
 	"github.com/docker/go-plugins-helpers/volume"
-	"github.com/ContainX/docker-volume-netshare/netshare/drivers"
 	"github.com/spf13/cobra"
 	"os"
 	"path/filepath"