Skip to content

rf: S3C-1399 Update Redis configuration #1223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Apr 27, 2018
Merged

rf: S3C-1399 Update Redis configuration #1223

merged 1 commit into from
Apr 27, 2018

Conversation

@bennettbuchanan
Copy link

@bennettbuchanan bennettbuchanan commented Apr 20, 2018 •
edited
Loading

@bennettbuchanan
Copy link
Author

bennettbuchanan commented Apr 20, 2018

@ironman-machine
SCALITY_FEDERATION_BRANCH=rf/S3C-1399/updateRedisConfig
try

@ironman-machine
Copy link
Contributor

ironman-machine commented Apr 20, 2018

Hello @bennettbuchanan

"SCALITY_FEDERATION_BRANCH=rf/S3C-1399/updateRedisConfig": Success
"try": Success: Try build successfully launched on 'http://ci.ironmann.io/gh/scality/Integration/21358' with the following env. args:

{
    "SCALITY_FEDERATION_BRANCH": "rf/S3C-1399/updateRedisConfig",
    "DEFAULT_BRANCH": "master",
    "SCALITY_INTEGRATION_BRANCH": "ultron/master",
    "REPO_NAME": "S3",
    "SCALITY_S3_BRANCH": "rf/S3C-1399/updateRedisConfig"
}

@bennettbuchanan bennettbuchanan force-pushed the rf/S3C-1399/updateRedisConfig branch from 78c27bc to 4f7bd52 Compare April 20, 2018 21:41
@ironman-machine
Copy link
Contributor

ironman-machine commented Apr 20, 2018

PR has been updated. Reviewers, please be cautious.

@bennettbuchanan
Copy link
Author

bennettbuchanan commented Apr 20, 2018

@ironman-machine
SCALITY_FEDERATION_BRANCH=rf/S3C-1399/updateRedisConfig
try

@ironman-machine
Copy link
Contributor

ironman-machine commented Apr 20, 2018

Hello @bennettbuchanan

"SCALITY_FEDERATION_BRANCH=rf/S3C-1399/updateRedisConfig": Success
"try": Success: Try build successfully launched on 'http://ci.ironmann.io/gh/scality/Integration/21371' with the following env. args:

{
    "SCALITY_FEDERATION_BRANCH": "rf/S3C-1399/updateRedisConfig",
    "DEFAULT_BRANCH": "master",
    "SCALITY_INTEGRATION_BRANCH": "ultron/master",
    "REPO_NAME": "S3",
    "SCALITY_S3_BRANCH": "rf/S3C-1399/updateRedisConfig"
}

@bennettbuchanan bennettbuchanan mentioned this pull request Apr 20, 2018
Merged
@ironman-machine
Copy link
Contributor

ironman-machine commented Apr 20, 2018

☀️ 👍 circleCI test succeeded!

@bennettbuchanan bennettbuchanan force-pushed the rf/S3C-1399/updateRedisConfig branch from 4f7bd52 to 399ecf5 Compare April 27, 2018 17:39
@ironman-machine
Copy link
Contributor

ironman-machine commented Apr 27, 2018

PR has been updated. Reviewers, please be cautious.

@ironman-machine
Copy link
Contributor

ironman-machine commented Apr 27, 2018 

CONFLICT (add/add): Merge conflict in tests/unit/utils/validateSearch.js
CONFLICT (add/add): Merge conflict in tests/unit/utils/proxyCompareURL.js
CONFLICT (add/add): Merge conflict in tests/unit/multipleBackend/locationConstraintCheck.js
CONFLICT (add/add): Merge conflict in tests/unit/api/bucketPutReplication.js
CONFLICT (add/add): Merge conflict in tests/unit/Config.js
CONFLICT (add/add): Merge conflict in tests/multipleBackend/multipartUpload.js
CONFLICT (add/add): Merge conflict in tests/functional/aws-node-sdk/test/multipleBackend/put/put.js
CONFLICT (add/add): Merge conflict in tests/functional/aws-node-sdk/test/bucket/getLocation.js
CONFLICT (add/add): Merge conflict in package.json
CONFLICT (add/add): Merge conflict in package-lock.json
CONFLICT (add/add): Merge conflict in lib/services.js
CONFLICT (add/add): Merge conflict in lib/routes/routeBackbeat.js
CONFLICT (add/add): Merge conflict in lib/metadata/ModelVersion.md
CONFLICT (add/add): Merge conflict in lib/data/external/GCP/GcpApis/mpuHelper.js
CONFLICT (add/add): Merge conflict in lib/data/external/AwsClient.js
CONFLICT (add/add): Merge conflict in lib/api/objectGet.js
CONFLICT (add/add): Merge conflict in lib/api/bucketPutReplication.js
CONFLICT (add/add): Merge conflict in lib/api/bucketPutLifecycle.js
CONFLICT (add/add): Merge conflict in lib/api/bucketPut.js
CONFLICT (add/add): Merge conflict in lib/api/apiUtils/bucket/validateSearch.js
CONFLICT (add/add): Merge conflict in lib/api/apiUtils/bucket/parseWhere.js
CONFLICT (add/add): Merge conflict in lib/api/apiUtils/bucket/bucketCreation.js
CONFLICT (add/add): Merge conflict in lib/Config.js
CONFLICT (add/add): Merge conflict in dataserver.js

@bennettbuchanan bennettbuchanan changed the base branch from master to z/1.0 April 27, 2018 17:39
@bennettbuchanan
Copy link
Author

bennettbuchanan commented Apr 27, 2018

@ironman-machine clean_env

@ironman-machine
Copy link
Contributor

ironman-machine commented Apr 27, 2018

Hello @bennettbuchanan

"clean_env": Success: Environment variables and after dependencies have been removed.

@bennettbuchanan
Copy link
Author

bennettbuchanan commented Apr 27, 2018

@ironman-machine
SCALITY_FEDERATION_BRANCH=rf/S3C-1399/updateRedisConfig
try

@ironman-machine
Copy link
Contributor

ironman-machine commented Apr 27, 2018

Hello @bennettbuchanan

"SCALITY_FEDERATION_BRANCH=rf/S3C-1399/updateRedisConfig": Success
"try": Failure: trigger_build error: 400 Client Error: Bad Request for url: http://ci.ironmann.io/api/v1/project/scality/Integration/tree/rf/S3C-1399/updateRedisConfig?circle-token=dfc24312a66b624ec3816b5e1bf0ce324b96cc3a

@bennettbuchanan
Copy link
Author

bennettbuchanan commented Apr 27, 2018

@ironman-machine
SCALITY_FEDERATION_BRANCH=rf/S3C-1399/updateRedisConfig
SCALITY_INTEGRATION_BRANCH=z/1.0
try

@ironman-machine
Copy link
Contributor

ironman-machine commented Apr 27, 2018

Hello @bennettbuchanan

"SCALITY_FEDERATION_BRANCH=rf/S3C-1399/updateRedisConfig": Success
"SCALITY_INTEGRATION_BRANCH=z/1.0": Success
"try": Success: Try build successfully launched on 'http://ci.ironmann.io/gh/scality/Integration/21659' with the following env. args:

{
    "SCALITY_FEDERATION_BRANCH": "rf/S3C-1399/updateRedisConfig",
    "DEFAULT_BRANCH": "z/1.0",
    "SCALITY_INTEGRATION_BRANCH": "z/1.0",
    "REPO_NAME": "S3",
    "SCALITY_S3_BRANCH": "rf/S3C-1399/updateRedisConfig"
}

@ironman-machine
Copy link
Contributor

ironman-machine commented Apr 27, 2018

💔 ☔ circleCI test failed.

@rahulreddy rahulreddy merged commit e7a1ab2 into z/1.0 Apr 27, 2018
@rahulreddy rahulreddy deleted the rf/S3C-1399/updateRedisConfig branch April 27, 2018 21:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rahulreddy rahulreddy rahulreddy approved these changes

@jonathan-gramain jonathan-gramain jonathan-gramain left review comments

+2 more reviewers

@philipyoo philipyoo philipyoo approved these changes

@ssalaues ssalaues ssalaues approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

prio-high

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@bennettbuchanan @ironman-machine @rahulreddy @jonathan-gramain @philipyoo @ssalaues