Skip to content
This repository has been archived by the owner on Aug 18, 2020. It is now read-only.

report-server: bump to latest master #3394

Merged
merged 4 commits into from
Aug 21, 2018
Merged

report-server: bump to latest master #3394

merged 4 commits into from
Aug 21, 2018

Conversation

deepfire
Copy link
Contributor

Linked issue

Type of change

  • 🐞 Bug fix (non-breaking change which fixes an issue)
  • 🛠 New feature (non-breaking change which adds functionality)
  • ⚠️ Breaking change (fix or feature that would cause existing functionality to change)
  • 🏭 Refactoring that does not change existing functionality but does improve things like code readability, structure etc
  • 🔨 New or improved tests for existing code
  • ⛑ git-flow chore (backport, hotfix, etc)

Developer checklist

  • I have read the style guide document, and my code follows the code style of this project.
  • If my code deals with exceptions, it follows the guidelines.
  • I have updated any documentation accordingly, if needed. Documentation changes can be reflected in opening a PR on cardanodocs.com, amending the inline Haddock comments, any relevant README file or one of the document listed in the docs directory.
  • CHANGELOG entry has been added and is linked to the correct PR on GitHub.

Testing checklist

  • I have added tests to cover my changes.
  • All new and existing tests passed.

QA Steps

Screenshots (if available)

@deepfire deepfire requested a review from ksaric August 14, 2018 11:41
ksaric
ksaric reviewed Aug 14, 2018
View reviewed changes
stack.yaml Outdated
@@ -72,7 +72,7 @@ packages:
extra-dep: true
- location:
git: https://github.com/input-output-hk/cardano-report-server.git
commit: 81eea7361a75923f9402fcb7840fb36722dbf88e # master 0.4.10
commit: 43622ed083887c60609e030cef6eadcd3dbd7b67 # master 0.4.10
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

master 0.4.10 -> master 0.5.10

@deepfire deepfire force-pushed the bump-report-server branch from fb260c5 to 80abdaf Compare August 14, 2018 11:46
@deepfire deepfire changed the base branch from develop to release/1.3.0 August 14, 2018 11:47
@deepfire deepfire force-pushed the bump-report-server branch from 80abdaf to 08339e4 Compare August 14, 2018 11:48
@deepfire deepfire requested a review from erikd as a code owner August 14, 2018 11:48
ksaric
ksaric previously approved these changes Aug 14, 2018
View reviewed changes
Copy link
Contributor

@ksaric ksaric left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

ksaric
ksaric previously approved these changes Aug 14, 2018
View reviewed changes
Copy link
Contributor

@ksaric ksaric left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

disassembler
disassembler suggested changes Aug 15, 2018
View reviewed changes
Copy link
Contributor

@disassembler disassembler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.3.0 is completed, we should rebase on/target 1.3.1.

@deepfire deepfire force-pushed the bump-report-server branch from b115ae3 to ca4e079 Compare August 17, 2018 16:10
@deepfire deepfire changed the base branch from release/1.3.0 to release/1.3.1 August 17, 2018 16:11
cleverca22 added a commit to input-output-hk/iohk-ops that referenced this pull request Aug 17, 2018
@cleverca22
bump cardano to tip of
3562f3f 
input-output-hk/cardano-sl#3394
cleverca22 added a commit to input-output-hk/iohk-ops that referenced this pull request Aug 17, 2018
@cleverca22
bump cardano to tip of
a5f0fb2 
input-output-hk/cardano-sl#3394
@deepfire
Copy link
Contributor Author

deepfire commented Aug 20, 2018 •
edited
Loading

@disassembler , this was rebased against 1.3.1

@deepfire deepfire merged commit 350d158 into release/1.3.1 Aug 21, 2018
@deepfire deepfire deleted the bump-report-server branch August 21, 2018 13:24
@ksaric ksaric restored the bump-report-server branch October 4, 2018 15:59
@ksaric ksaric mentioned this pull request Oct 5, 2018
Merged
12 tasks
@ksaric ksaric deleted the bump-report-server branch October 9, 2018 15:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@disassembler disassembler disassembler approved these changes

@ksaric ksaric ksaric left review comments

@erikd erikd Awaiting requested review from erikd erikd is a code owner

@adinapoli-iohk adinapoli-iohk Awaiting requested review from adinapoli-iohk

@akegalj akegalj Awaiting requested review from akegalj

@avieth avieth Awaiting requested review from avieth

@dcoutts dcoutts Awaiting requested review from dcoutts

@denisshevchenko denisshevchenko Awaiting requested review from denisshevchenko

@iohk-devops iohk-devops Awaiting requested review from iohk-devops

@parsonsmatt parsonsmatt Awaiting requested review from parsonsmatt

@vincenthz vincenthz Awaiting requested review from vincenthz

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@deepfire @disassembler @ksaric @cleverca22