Skip to content

Follow up 125#133

Merged
mjcarroll merged 1 commit intoros2:masterfrom
mikaelarguedas:follow-up-125
Jun 26, 2019
Merged

Follow up 125#133
mjcarroll merged 1 commit intoros2:masterfrom
mikaelarguedas:follow-up-125

Conversation

@mikaelarguedas
Copy link
Member

Changes the permissions check to test not only that it's valid xml but also a valid permission file.
Rename argument to highlight that it's unused

@kyrofa FYI it may conflict with #132, but can be easily rebased if 132 gets in before this

Copy link
Member

@kyrofa kyrofa left a comment

Choose a reason for hiding this comment

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

Thanks for this, @mikaelarguedas! Also, no problem, happy to deconflict if necessary.

@mikaelarguedas
Copy link
Member Author

Rebased and deconflicted

@jacobperron
Copy link
Member

jacobperron commented Jun 26, 2019

#138 might conflict with this one as well.

Since this is the smaller PR, maybe we hold off on merging it until #138 is in?

Edit: This needs a rebase, sorry.

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
@mikaelarguedas
Copy link
Member Author

Rebased and deconflicted again

@mjcarroll mjcarroll merged commit 67a33eb into ros2:master Jun 26, 2019
@mikaelarguedas mikaelarguedas deleted the follow-up-125 branch June 26, 2019 18:28
ruffsl pushed a commit to ruffsl/sros2 that referenced this pull request Aug 6, 2019
Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
Signed-off-by: ruffsl <roxfoxpox@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants