Merge branch 'master' of github.com:mastertinner/s3manager

Gopkg.lock

@@ -22,7 +22,7 @@ memo = "2564b0b342a1586a24a3ff5356636c822f6351da32f8ee9497ab8694855e80b1"
   branch = "master"
   name = "github.com/mastertinner/adapters"
   packages = [".","logging"]
-  revision = "3bfe6170b9beca289d89e4c703c7f9db68e7c158"
+  revision = "4c901f564b5e3975464696a1cb78d44509133f43"
 
 [[projects]]
   name = "github.com/minio/minio-go"

README.md

@@ -25,6 +25,6 @@ A Web GUI written in Go to manage S3 buckets from any provider.
 
 ## Run on Cloud Foundry
 
-1. Change the service in `manifest.yml` to be the name of your S3 service (if you are using an external S3 provider, you'll have to switch the service type in `run-cf.sh` from `dynstrg` to `user-provided` and create the respective user-provided service with `cf create-user-provided-service`)
+1. Change the service in `manifest.yml` to represent your S3 service (if you are using an external S3 provider, you'll have to switch the service type in `entrypoint-cf.sh` from `dynstrg` to `user-provided` and create the respective user-provided service with `cf create-user-provided-service`)
 1. Change `host` in `manifest.yml` to something that isn't taken yet
 1. Run `make deploy-cf`

vendor/github.com/mastertinner/adapters/oauth2/.gitignore

@@ -1 +0,0 @@
-vendor

vendor/github.com/mastertinner/adapters/oauth2/Gopkg.lock

@@ -0,0 +1,43 @@
+memo = "3f23568a8640e61d2e21220dfffbc576be6b4e6b60ad494b31a30c6372e7cd91"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golang/protobuf"
+  packages = ["proto"]
+  revision = "18c9bb3261723cd5401db4d0c9fbc5c3b6c70fe8"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mastertinner/adapters"
+  packages = ["."]
+  revision = "3bfe6170b9beca289d89e4c703c7f9db68e7c158"
+
+[[projects]]
+  name = "github.com/satori/go.uuid"
+  packages = ["."]
+  revision = "879c5887cd475cd7864858769793b2ceb0d44feb"
+  version = "v1.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/net"
+  packages = ["context"]
+  revision = "feeb485667d1fdabe727840fe00adc22431bc86e"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/oauth2"
+  packages = [".","internal"]
+  revision = "e7a48207996f497ea86f5736d08d99d45c0b6461"
+
+[[projects]]
+  name = "google.golang.org/appengine"
+  packages = ["internal","internal/base","internal/datastore","internal/log","internal/remote_api","internal/urlfetch","urlfetch"]
+  revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "gopkg.in/redis.v5"
+  packages = [".","internal","internal/consistenthash","internal/hashtag","internal/pool","internal/proto"]
+  revision = "a16aeec10ff407b1e7be6dd35797ccf5426ef0f0"
+  version = "v5.2.9"

vendor/github.com/mastertinner/adapters/oauth2/Gopkg.toml

@@ -0,0 +1,68 @@
+
+## Gopkg.toml example (these lines may be deleted)
+
+## "required" lists a set of packages (not projects) that must be included in
+## Gopkg.lock. This list is merged with the set of packages imported by the current
+## project. Use it when your project needs a package it doesn't explicitly import -
+## including "main" packages.
+# required = ["github.com/user/thing/cmd/thing"]
+
+## "ignored" lists a set of packages (not projects) that are ignored when
+## dep statically analyzes source code. Ignored packages can be in this project,
+## or in a dependency.
+# ignored = ["github.com/user/project/badpkg"]
+
+## Dependencies define constraints on dependent projects. They are respected by
+## dep whether coming from the Gopkg.toml of the current project or a dependency.
+# [[dependencies]]
+## Required: the root import path of the project being constrained.
+# name = "github.com/user/project"
+#
+## Recommended: the version constraint to enforce for the project.
+## Only one of "branch", "version" or "revision" can be specified.
+# version = "1.0.0"
+# branch = "master"
+# revision = "abc123"
+#
+## Optional: an alternate location (URL or import path) for the project's source.
+# source = "https://github.com/myfork/package.git"
+
+## Overrides have the same structure as [[dependencies]], but supercede all
+## [[dependencies]] declarations from all projects. Only the current project's
+## [[overrides]] are applied.
+##
+## Overrides are a sledgehammer. Use them only as a last resort.
+# [[overrides]]
+## Required: the root import path of the project being constrained.
+# name = "github.com/user/project"
+#
+## Optional: specifying a version constraint override will cause all other
+## constraints on this project to be ignored; only the overriden constraint
+## need be satisfied.
+## Again, only one of "branch", "version" or "revision" can be specified.
+# version = "1.0.0"
+# branch = "master"
+# revision = "abc123"
+#
+## Optional: specifying an alternate source location as an override will
+## enforce that the alternate location is used for that project, regardless of
+## what source location any dependent projects specify.
+# source = "https://github.com/myfork/package.git"
+
+
+
+[[dependencies]]
+  branch = "master"
+  name = "github.com/mastertinner/adapters"
+
+[[dependencies]]
+  name = "github.com/satori/go.uuid"
+  version = "^1.1.0"
+
+[[dependencies]]
+  branch = "master"
+  name = "golang.org/x/oauth2"
+
+[[dependencies]]
+  name = "gopkg.in/redis.v5"
+  version = "^5.2.9"

vendor/github.com/mastertinner/adapters/oauth2/glide.lock

@@ -1,38 +0,0 @@
-hash: 2930195423c156b85ae0be9ef95d0dfcaa988b54bba4f088f767f05b3a108912
-updated: 2017-05-01T10:50:48.686241497+02:00
-imports:
-- name: github.com/golang/protobuf
-  version: 69b215d01a5606c843240eab4937eab3acee6530
-  subpackages:
-  - proto
-- name: github.com/mastertinner/adapters
-  version: 5510790dd79e084a0b849ec99df4403af9344b45
-- name: github.com/satori/go.uuid
-  version: 879c5887cd475cd7864858769793b2ceb0d44feb
-- name: golang.org/x/net
-  version: 6b27048ae5e6ad1ef927e72e437531493de612fe
-  subpackages:
-  - context
-- name: golang.org/x/oauth2
-  version: b9780ec78894ab900c062d58ee3076cd9b2a4501
-  subpackages:
-  - internal
-- name: google.golang.org/appengine
-  version: 2e4a801b39fc199db615bfca7d0b9f8cd9580599
-  subpackages:
-  - internal
-  - internal/base
-  - internal/datastore
-  - internal/log
-  - internal/remote_api
-  - internal/urlfetch
-  - urlfetch
-- name: gopkg.in/redis.v5
-  version: a16aeec10ff407b1e7be6dd35797ccf5426ef0f0
-  subpackages:
-  - internal
-  - internal/consistenthash
-  - internal/hashtag
-  - internal/pool
-  - internal/proto
-testImports: []

vendor/github.com/mastertinner/adapters/oauth2/glide.yaml

@@ -1,7 +0,0 @@
-package: github.com/mastertinner/adapters/oauth2
-import:
-- package: golang.org/x/oauth2
-- package: gopkg.in/redis.v5
-  version: ^5.2.9
-- package: github.com/satori/go.uuid
-  version: ^1.1.0