diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2018-07-24 02:19:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 02:19:06 -0700 |
| commit | 0fb4f59fa601eb39c1718a41dca51a05f6b3e5bb (patch) | |
| tree | 96a91af29567446f49ce5cda459b6d9437e7f233 /weed/s3api | |
| parent | e8a5ee4f480f1e7d4c751ccd0b303e2a001568d0 (diff) | |
| parent | 77fadab56005d0a0a1b69e06e1c057ddd5a45893 (diff) | |
| download | seaweedfs-0fb4f59fa601eb39c1718a41dca51a05f6b3e5bb.tar.xz seaweedfs-0fb4f59fa601eb39c1718a41dca51a05f6b3e5bb.zip | |
Merge pull request #697 from chrislusf/add_version3
Add version3
Diffstat (limited to 'weed/s3api')
| -rw-r--r-- | weed/s3api/s3api_bucket_handlers.go | 7 | ||||
| -rw-r--r-- | weed/s3api/s3api_objects_list_handlers.go | 11 |
2 files changed, 10 insertions, 8 deletions
diff --git a/weed/s3api/s3api_bucket_handlers.go b/weed/s3api/s3api_bucket_handlers.go index af05d0a93..a97434ed0 100644 --- a/weed/s3api/s3api_bucket_handlers.go +++ b/weed/s3api/s3api_bucket_handlers.go @@ -3,12 +3,13 @@ package s3api import ( "context" "fmt" - "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" - "github.com/gorilla/mux" "net/http" "os" "time" + + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" + "github.com/gorilla/mux" ) var ( diff --git a/weed/s3api/s3api_objects_list_handlers.go b/weed/s3api/s3api_objects_list_handlers.go index a0ab9b964..721982d0f 100644 --- a/weed/s3api/s3api_objects_list_handlers.go +++ b/weed/s3api/s3api_objects_list_handlers.go @@ -3,17 +3,18 @@ package s3api import ( "context" "fmt" - "github.com/chrislusf/seaweedfs/weed/filer2" - "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" - "github.com/gorilla/mux" "net/http" "net/url" "path/filepath" "strconv" "time" - "github.com/aws/aws-sdk-go/service/s3" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/s3" + "github.com/chrislusf/seaweedfs/weed/filer2" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" + "github.com/gorilla/mux" ) const ( |