Merge pull request #160 from contiv/master

Merge master into release-1.1 for release
contiv · Sep 25, 2017 · e206149 · e206149
2 parents b57fb9b + ba5981f
commit e206149
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build/Dockerfile.checks b/build/Dockerfile.checks
@@ -5,7 +5,7 @@ RUN go get github.com/golang/lint/golint
 RUN go get github.com/fzipp/gocyclo
 RUN go get github.com/client9/misspell/...
 RUN go get github.com/remyoudompheng/go-misc/deadcode/...
-RUN go get github.com/mvdan/sh/cmd/shfmt
+RUN go get github.com/contiv-experimental/sh/cmd/shfmt
 
 COPY ./ /go/src/github.com/contiv/auth_proxy
 

diff --git a/systemtests/basic_test.go b/systemtests/basic_test.go
@@ -15,7 +15,7 @@ const (
 	// XXX: Yuva's dev server
 	ldapServer        = "10.193.231.158"
 	ldapPassword      = "C1ntainer$"
-	ldapAdminPassword = "C1ntainer$~"
+	ldapAdminPassword = "C1ntainer$!"
 	ldapTestUsername  = "test_user"
 	tlsCertIssuedTo   = "WIN-EDME78NSVJO.contiv.ad.local"