Merge branch 'release/v3.1.7'

glide.yaml

@@ -4,7 +4,7 @@ import:
 - package: github.com/codegangsta/cli
 - package: github.com/hashicorp/go-plugin
 - package: github.com/pivotalservices/cfbackup
-  version: v0.1.157
+  version: v0.1.158
   subpackages:
   - tiles
   - tiles/opsmanager

integration/cmd_test.go

@@ -107,6 +107,10 @@ func basicAuthDirectorHandlers(directorURL string) []http.HandlerFunc {
 			ghttp.VerifyRequest("GET", "/tasks/2"),
 			ghttp.RespondWith(http.StatusOK, getTaskResponseOK("2")),
 		),
+		ghttp.CombineHandlers(
+			ghttp.VerifyRequest("GET", "/info"),
+			ghttp.RespondWith(http.StatusOK, infoResponse),
+		),
 		ghttp.CombineHandlers(
 			ghttp.VerifyRequest("PUT", "/deployments/cf-f21eea2dbdb8555f89fb/jobs/cloud_controller-partition-7bc61fd2fa9d654696df/0", "state=started"),
 			ghttp.VerifyBody([]byte(``)),
@@ -183,6 +187,15 @@ func uaaAuthDirectorHandlers(directorURL string) []http.HandlerFunc {
 			ghttp.VerifyRequest("GET", "/tasks/2"),
 			ghttp.RespondWith(http.StatusOK, getTaskResponseOK("2")),
 		),
+		ghttp.CombineHandlers(
+			ghttp.VerifyRequest("GET", "/info"),
+			ghttp.RespondWith(http.StatusOK, infoResponse),
+		),
+		ghttp.CombineHandlers(
+			ghttp.VerifyRequest("POST", "/oauth/token"),
+			ghttp.RespondWith(http.StatusOK, tokenResponse, http.Header{
+				"Content-Type": []string{"application/json"}}),
+		),
 		ghttp.CombineHandlers(
 			ghttp.VerifyRequest("PUT", "/deployments/cf-f21eea2dbdb8555f89fb/jobs/cloud_controller-partition-7bc61fd2fa9d654696df/0", "state=started"),
 			ghttp.VerifyBody([]byte(``)),

wercker.yml

@@ -78,7 +78,7 @@ deploy:
 
     - wercker/[email protected]:
         hostname: github.com
-        fingerprint: 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48
+        fingerprint: SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8
 
     - script:
         name: set release id variable for version