Merge pull request #40 from gondor/master

Release 0.17 - Bug fixes

Author: gondor

.goxc.json

@@ -9,7 +9,7 @@
    "subject": "pacesys"
   },
    "publish-github": {
-      "owner": "gondor",
+      "owner": "ContainX",
       "repository": "docker-volume-netshare"
   },
   "debs": {

Makefile

@@ -1,4 +1,4 @@
-VERSION = 0.16
+VERSION = 0.17
 GO_FMT = gofmt -s -w -l .
 GO_XC = goxc -os="linux" -tasks-="rmbin" 
 

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`

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"

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
-