Skip to content

Commit

Permalink
Adds missing codebase MinIO and min.io changes (#2745)
Browse files Browse the repository at this point in the history
  • Loading branch information
ebozduman authored and kannappanr committed Apr 17, 2019
1 parent 68a9eea commit 83a9d8b
Show file tree
Hide file tree
Showing 173 changed files with 392 additions and 392 deletions.
10 changes: 5 additions & 5 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#
# For explanation on this file format: man git-shortlog

Anand Babu (AB) Periasamy <ab@minio.io> Anand Babu (AB) Periasamy <[email protected]>
Anand Babu (AB) Periasamy <ab@minio.io> <[email protected]>
Anand Babu (AB) Periasamy <ab@min.io> Anand Babu (AB) Periasamy <[email protected]>
Anand Babu (AB) Periasamy <ab@min.io> <[email protected]>
Anis Elleuch <[email protected]>
Frederick F. Kautz IV <fkautz@minio.io> <[email protected]>
Harshavardhana <harsha@minio.io> <[email protected]>
Krishna Srinivas <krishna@minio.io> <[email protected]>
Frederick F. Kautz IV <fkautz@min.io> <[email protected]>
Harshavardhana <harsha@min.io> <[email protected]>
Krishna Srinivas <krishna@min.io> <[email protected]>
Bosky <[email protected]>
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM golang:1.12-alpine

LABEL maintainer="Minio Inc <dev@minio.io>"
LABEL maintainer="MinIO Inc <dev@min.io>"

ENV GOPATH /go
ENV CGO_ENABLED 0
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.release
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM alpine:3.9

MAINTAINER Minio Inc <dev@minio.io>
MAINTAINER MinIO Inc <dev@min.io>

RUN \
apk add --no-cache ca-certificates && \
apk add --no-cache --virtual .build-deps curl && \
curl https://dl.minio.io/client/mc/release/linux-amd64/mc > /usr/bin/mc && \
curl https://dl.min.io/client/mc/release/linux-amd64/mc > /usr/bin/mc && \
chmod +x /usr/bin/mc && apk del .build-deps

ENTRYPOINT ["mc"]
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spelling:
@${GOPATH}/bin/misspell -error `find pkg/`
@${GOPATH}/bin/misspell -error `find docs/`

# Builds minio, runs the verifiers then runs the tests.
# Builds MinIO, runs the verifiers then runs the tests.
check: test
test: verifiers build
@echo "Running unit tests"
Expand All @@ -55,15 +55,15 @@ test: verifiers build
@(env bash $(PWD)/functional-tests.sh)

coverage: build
@echo "Running all coverage for minio"
@echo "Running all coverage for MinIO"
@(env bash $(PWD)/buildscripts/go-coverage.sh)

# Builds minio locally.
# Builds MinIO locally.
build: checks
@echo "Building minio binary to './mc'"
@echo "Building MinIO binary to './mc'"
@GO111MODULE=on GO_FLAGS="" CGO_ENABLED=0 go build -tags kqueue --ldflags $(BUILD_LDFLAGS) -o $(PWD)/mc

# Builds minio and installs it to $GOPATH/bin.
# Builds MinIO and installs it to $GOPATH/bin.
install: build
@echo "Installing mc binary to '$(GOPATH)/bin/mc'"
@mkdir -p $(GOPATH)/bin && cp -uf $(PWD)/mc $(GOPATH)/bin/mc
Expand Down
8 changes: 4 additions & 4 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Minio Client (C) 2014, 2015 Minio, Inc.
MinIO Client (C) 2014, 2015 MinIO, Inc.

This product includes software developed at Minio, Inc.
(https://minio.io/).
This product includes software developed at MinIO, Inc.
(https://min.io/).

The Minio project contains unmodified/modified subcomponents too with
The MinIO project contains unmodified/modified subcomponents too with
separate copyright notices and license terms. Your use of the source
code for the these subcomponents is subject to the terms and conditions
of the following licenses.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ rm remove objects
event manage object notifications
watch watch for object events
policy manage anonymous access to objects
admin manage minio servers
admin manage MinIO servers
session manage saved sessions for cp command
config manage mc configuration file
update check for a new software update
Expand Down Expand Up @@ -62,11 +62,11 @@ mc --help
### Binary Download
| Platform | Architecture | URL |
| ---------- | -------- |------|
|GNU/Linux|64-bit Intel|https://dl.minio.io/client/mc/release/linux-amd64/mc |
||64-bit PPC|https://dl.minio.io/client/mc/release/linux-ppc64le/mc |
|GNU/Linux|64-bit Intel|https://dl.min.io/client/mc/release/linux-amd64/mc |
||64-bit PPC|https://dl.min.io/client/mc/release/linux-ppc64le/mc |

```sh
wget https://dl.minio.io/client/mc/release/linux-amd64/mc
wget https://dl.min.io/client/mc/release/linux-amd64/mc
chmod +x mc
./mc --help
```
Expand All @@ -75,7 +75,7 @@ chmod +x mc
### Binary Download
| Platform | Architecture | URL |
| ---------- | -------- |------|
|Microsoft Windows|64-bit Intel|https://dl.minio.io/client/mc/release/windows-amd64/mc.exe |
|Microsoft Windows|64-bit Intel|https://dl.min.io/client/mc/release/windows-amd64/mc.exe |

```sh
mc.exe --help
Expand Down Expand Up @@ -156,11 +156,11 @@ mc config host add gcs https://storage.googleapis.com BKIKJAA5BMMU2RHO6IBB V8f1
NOTE: Google Cloud Storage only supports Legacy Signature Version 2, so you have to pick - S3v2

## Test Your Setup
`mc` is pre-configured with https://play.minio.io:9000, aliased as "play". It is a hosted MinIO server for testing and development purpose. To test Amazon S3, simply replace "play" with "s3" or the alias you used at the time of setup.
`mc` is pre-configured with https://play.min.io:9000, aliased as "play". It is a hosted MinIO server for testing and development purpose. To test Amazon S3, simply replace "play" with "s3" or the alias you used at the time of setup.

*Example:*

List all buckets from https://play.minio.io:9000
List all buckets from https://play.min.io:9000

```sh
mc ls play
Expand Down
8 changes: 4 additions & 4 deletions README_zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ mc --help
### 下载二进制文件
| 平台 | CPU架构 | URL |
| ---------- | -------- |------|
|GNU/Linux|64-bit Intel|https://dl.minio.io/client/mc/release/linux-amd64/mc |
|GNU/Linux|64-bit Intel|https://dl.min.io/client/mc/release/linux-amd64/mc |

```sh
chmod +x mc
Expand All @@ -69,7 +69,7 @@ chmod +x mc
### 下载二进制文件
| 平台 | CPU架构 | URL |
| ---------- | -------- |------|
|Microsoft Windows|64-bit Intel|https://dl.minio.io/client/mc/release/windows-amd64/mc.exe |
|Microsoft Windows|64-bit Intel|https://dl.min.io/client/mc/release/windows-amd64/mc.exe |

```sh
mc.exe --help
Expand Down Expand Up @@ -121,11 +121,11 @@ mc config host add gcs https://storage.googleapis.com BKIKJAA5BMMU2RHO6IBB V8f1
注意:Google云存储只支持旧版签名版本V2,所以你需要选择S3v2。

## 验证
`mc`预先配置了云存储服务URL:https://play.minio.io:9000,别名“play”。它是一个用于研发和测试的MinIO服务。如果想测试Amazon S3,你可以将“play”替换为“s3”。
`mc`预先配置了云存储服务URL:https://play.min.io:9000,别名“play”。它是一个用于研发和测试的MinIO服务。如果想测试Amazon S3,你可以将“play”替换为“s3”。

*示例:*

列出https://play.minio.io:9000上的所有存储桶。
列出https://play.min.io:9000上的所有存储桶。

```sh
mc ls play
Expand Down
4 changes: 2 additions & 2 deletions buildscripts/checkdeps.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Minio Client, (C) 2015, 2016, 2017, 2018, 2019 Minio, Inc.
# MinIO Client, (C) 2015, 2016, 2017, 2018, 2019 MinIO, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -97,7 +97,7 @@ assert_is_supported_os() {

assert_check_golang_env() {
if ! which go >/dev/null 2>&1; then
echo "Cannot find go binary in your PATH configuration, please refer to Go installation document at https://docs.minio.io/docs/how-to-install-golang"
echo "Cannot find go binary in your PATH configuration, please refer to Go installation document at https://docs.min.io/docs/how-to-install-golang"
exit 1
fi

Expand Down
2 changes: 1 addition & 1 deletion buildscripts/gen-ldflags.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// +build ignore

/*
* Minio Client (C) 2014, 2015, 2016, 2017, 2018 Minio, Inc.
* MinIO Client (C) 2014, 2015, 2016, 2017, 2018 MinIO, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmd/access-perms.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Minio Client (C) 2015 Minio, Inc.
* MinIO Client (C) 2015 MinIO, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmd/accounting-reader.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Minio Client (C) 2014, 2015 Minio, Inc.
* MinIO Client (C) 2014, 2015 MinIO, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
8 changes: 4 additions & 4 deletions cmd/admin-config-get.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Minio Client (C) 2017 Minio, Inc.
* MinIO Client (C) 2017 MinIO, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -24,7 +24,7 @@ import (

var adminConfigGetCmd = cli.Command{
Name: "get",
Usage: "get config of a minio server/cluster",
Usage: "get config of a MinIO server/cluster",
Before: setGlobalsFromContext,
Action: mainAdminConfigGet,
Flags: globalFlags,
Expand All @@ -38,7 +38,7 @@ FLAGS:
{{range .VisibleFlags}}{{.}}
{{end}}
EXAMPLES:
1. Get server configuration of a Minio server/cluster.
1. Get server configuration of a MinIO server/cluster.
$ {{.HelpName}} play/
`,
Expand Down Expand Up @@ -82,7 +82,7 @@ func mainAdminConfigGet(ctx *cli.Context) error {
args := ctx.Args()
aliasedURL := args.Get(0)

// Create a new Minio Admin Client
// Create a new MinIO Admin Client
client, err := newAdminClient(aliasedURL)
fatalIf(err, "Cannot get a configured admin connection.")

Expand Down
12 changes: 6 additions & 6 deletions cmd/admin-config-set.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Minio Client (C) 2017 Minio, Inc.
* MinIO Client (C) 2017 MinIO, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -28,7 +28,7 @@ import (

var adminConfigSetCmd = cli.Command{
Name: "set",
Usage: "set new config file to a minio server/cluster.",
Usage: "set new config file to a MinIO server/cluster.",
Before: setGlobalsFromContext,
Action: mainAdminConfigSet,
Flags: globalFlags,
Expand All @@ -42,7 +42,7 @@ FLAGS:
{{range .VisibleFlags}}{{.}}
{{end}}
EXAMPLES:
1. Set server configuration of a Minio server/cluster.
1. Set server configuration of a MinIO server/cluster.
$ cat myconfig | {{.HelpName}} myminio/
`,
Expand All @@ -59,12 +59,12 @@ func (u configSetMessage) String() (msg string) {
// Print the general set config status
if u.setConfigStatus {
msg += console.Colorize("SetConfigSuccess",
"Setting new Minio configuration file has been successful.\n")
"Setting new MinIO configuration file has been successful.\n")
msg += console.Colorize("SetConfigSuccess",
"Please restart your server with `mc admin service restart`.\n")
} else {
msg += console.Colorize("SetConfigFailure",
"Setting new Minio configuration file has failed.\n")
"Setting new MinIO configuration file has failed.\n")
}
return
}
Expand Down Expand Up @@ -103,7 +103,7 @@ func mainAdminConfigSet(ctx *cli.Context) error {
args := ctx.Args()
aliasedURL := args.Get(0)

// Create a new Minio Admin Client
// Create a new MinIO Admin Client
client, err := newAdminClient(aliasedURL)
fatalIf(err, "Cannot get a configured admin connection.")

Expand Down
2 changes: 1 addition & 1 deletion cmd/admin-config.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Minio Client (C) 2017, 2018 Minio, Inc.
* MinIO Client (C) 2017, 2018 MinIO, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
12 changes: 6 additions & 6 deletions cmd/admin-credential.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Minio Client (C) 2016, 2017, 2018 Minio, Inc.
* MinIO Client (C) 2016, 2017, 2018 MinIO, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -42,8 +42,8 @@ FLAGS:
{{range .VisibleFlags}}{{.}}
{{end}}
EXAMPLES:
1. Set new **admin** credential of a Minio server represented by its alias 'alias'.
$ {{.HelpName}} alias/ minio minio123
1. Set new **admin** credential of a MinIO server represented by its alias 'alias'.
$ {{.HelpName}} alias minio minio123
`,
}
Expand All @@ -65,15 +65,15 @@ func mainAdminCreds(ctx *cli.Context) error {
args := ctx.Args()
// TODO: if accessKey and secretKey are not supplied we should
// display the existing credential. This needs GetCredential
// support from Minio server.
// support from MinIO server.
aliasedURL := args.First()
accessKey, secretKey := args.Get(1), args.Get(2)

// Create a new Minio Admin Client
// Create a new MinIO Admin Client
client, err := newAdminClient(aliasedURL)
fatalIf(err, "Cannot get a configured admin connection.")

// Change the credential of the specified Minio server
// Change the credential of the specified MinIO server
e := client.SetAdminCredentials(accessKey, secretKey)
fatalIf(probe.NewError(e), "Unable to set new credential to '"+aliasedURL+"'.")

Expand Down
2 changes: 1 addition & 1 deletion cmd/admin-heal-result-item.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Minio Client (C) 2018 Minio, Inc.
* MinIO Client (C) 2018 MinIO, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmd/admin-heal-ui.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Minio Client (C) 2018 Minio, Inc.
* MinIO Client (C) 2018 MinIO, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
10 changes: 5 additions & 5 deletions cmd/admin-heal.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Minio Client (C) 2017, 2018 Minio, Inc.
* MinIO Client (C) 2017, 2018 MinIO, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -63,7 +63,7 @@ var adminHealFlags = []cli.Flag{

var adminHealCmd = cli.Command{
Name: "heal",
Usage: "heal disks, buckets and objects on minio server",
Usage: "heal disks, buckets and objects on MinIO server",
Action: mainAdminHeal,
Before: setGlobalsFromContext,
Flags: append(adminHealFlags, globalFlags...),
Expand All @@ -83,10 +83,10 @@ SCAN MODES:
deep : Heal objects which are missing on one or more disks. Also heal objects with silent data corruption.
EXAMPLES:
1. To format newly replaced disks in a Minio server with alias 'play'
1. To format newly replaced disks in a MinIO server with alias 'play'
$ {{.HelpName}} play
2. Heal 'testbucket' in a Minio server with alias 'play'
2. Heal 'testbucket' in a MinIO server with alias 'play'
$ {{.HelpName}} play/testbucket/
3. Heal all objects under 'dir' prefix
Expand Down Expand Up @@ -155,7 +155,7 @@ func mainAdminHeal(ctx *cli.Context) error {
console.SetColor("HealUpdateUI", color.New(color.FgYellow, color.Bold))
console.SetColor("HealStopped", color.New(color.FgGreen, color.Bold))

// Create a new Minio Admin Client
// Create a new MinIO Admin Client
client, err := newAdminClient(aliasedURL)
if err != nil {
fatalIf(err.Trace(aliasedURL), "Cannot initialize admin client.")
Expand Down
Loading

0 comments on commit 83a9d8b

Please sign in to comment.