squash merge from dev branch

2017-09-04 22:52:14 -04:00
parent 123cd935a3
commit ed916703c6
1058 changed files with 311598 additions and 3 deletions
--- a/glide.yaml
+++ b/glide.yaml
@@ -5,3 +5,6 @@ import:
 - package: gopkg.in/routeros.v2
 - package: go.uber.org/zap
  version: ~1.5.0
+- package: go.uber.org/atomic
+  version: ~1.2.0
+- package: github.com/sirupsen/logrus