Skip to content

Merge Dev into Master. #51

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 25 commits into from
Jul 13, 2018
Merged

Merge Dev into Master. #51

merged 25 commits into from
Jul 13, 2018

Conversation

@parrobe
Copy link
Member

@parrobe parrobe commented Jul 12, 2018

Please ensure all items are complete before opening.

What

  • Corrected package imports
  • Formatted go code with go fmt
  • Rearranged this file
  • Removed logging from golang package mqmetric
  • Moved samples to a separate repository
  • Added build scripts for ibmmq and mqmetric packages and ibmmq samples
  • Added unit tests for ibmmq and mqmetric packages

How

N/A

Testing

Unit Testing

Issues

N/A

sdmarshall79 and others added 22 commits May 14, 2018 14:57
@sdmarshall79
Fix imports for mqmetric and ibmmq
392025a
@sdmarshall79
Readme fix
c4f8728
@parrobe
Merge pull request #36 from sdmarshall79/dev
691ea52 
Fix imports for mqmetric and ibmmq
@parrobe
Update README/CHANGES
ee49384
@parrobe
Remove logrus dependency and remove logs from package
8963f7d
@parrobe
Move samples to seperate repository
ccdf10c
@parrobe
Comments on PR
c874d56
@parrobe
Merge pull request #38 from parrobe/makefile
83109d2 
Remove logging and move Samples
@parrobe
Remove references to dependencies, correct mistakes
8b2e8ca
@sdmarshall79
Merge pull request #39 from parrobe/makefile
199bcd8 
Remove references to dependencies, correct mistakes
@sdmarshall79
Fix issue with returning errors
92c1d83
@parrobe
Merge pull request #40 from sdmarshall79/dev
a124ab8 
Fix issue with returning errors
@parrobe
Add an automated build
51271ee
@sdmarshall79
Merge pull request #41 from parrobe/makefile
67c3955 
Add an automated build
@parrobe
Add unit tests for packages
d75d4f1
@parrobe
Merge pull request #42 from parrobe/test
294f0c9 
Add unit tests for packages
@parrobe
Update method to generate metric description
78c9cce
@sdmarshall79
Merge pull request #44 from parrobe/dev
3541d35 
Update method to generate metric description
@parrobe
check rc incase it is not no_more_msg
d4a05b0
@parrobe
Merge pull request #47 from parrobe/errorhandle
f15a287 
check rc incase it is not no_more_msg
@riccardobiraghi
Refactor and extend existing tests
0c405d2
@parrobe
Merge pull request #49 from riccardobiraghi/dev
47731a3 
Refactor and extend existing tests
@parrobe parrobe requested review from arthurbarr and ibmmqmet July 12, 2018 13:03
@parrobe
Copy link
Member Author

parrobe commented Jul 12, 2018

On hold while we resolve conflicts

@parrobe parrobe changed the title Dev Merge Dev into Master. Jul 12, 2018
ibmmqmet
ibmmqmet approved these changes Jul 12, 2018
View reviewed changes
Copy link
Collaborator

@ibmmqmet ibmmqmet left a comment

Choose a reason for hiding this comment

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

Looks OK from here

@parrobe parrobe merged commit 1b2a2ad into master Jul 13, 2018
@parrobe parrobe deleted the dev branch July 13, 2018 07:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@arthurbarr arthurbarr arthurbarr approved these changes

@ibmmqmet ibmmqmet ibmmqmet approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@parrobe @arthurbarr @ibmmqmet @sdmarshall79 @riccardobiraghi