Skip to content

Conversation

chapulina
Copy link
Contributor

Signed-off-by: Louise Poubel louise@openrobotics.org

@scpeters
Copy link
Member

it looks like the formatting in this PR matches the changes you noted in #233 (comment) that aren't yet included on master.

as I think about how to resolve these conflicts, it make me wonder if we are still going to merge branches forward? or will we use the cherry-pick strategy?

@chapulina
Copy link
Contributor Author

it make me wonder if we are still going to merge branches forward? or will we use the cherry-pick strategy?

I don't have a strong preference. I've been merging forward gazebo_ros_pkgs because that's what I'm most comfortable with, but perhaps cherry-picking could be cleaner.

@j-rivero
Copy link
Contributor

@osrf-jenkins run tests

@chapulina
Copy link
Contributor Author

it looks like the formatting in this PR matches the changes you noted in #233 (comment) that aren't yet included on master.

See #246

chapulina and others added 4 commits May 7, 2020 16:17
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
* [sdf8] Changelog links to BitBucket backup

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* more fixes, new version of script

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* [sdf7] Changelog links to BitBucket backup (#238)

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* Update some more bitbucket issue references

Signed-off-by: Steven Peters <scpeters@openrobotics.org>

Co-authored-by: Steven Peters <scpeters@openrobotics.org>
Signed-off-by: Steven Peters <scpeters@openrobotics.org>
@scpeters scpeters force-pushed the github_changelog_9 branch from d6f4e7f to 2205e31 Compare May 7, 2020 23:32
Signed-off-by: Steven Peters <scpeters@openrobotics.org>
@scpeters
Copy link
Member

scpeters commented May 7, 2020

I just noticed an incorrect link in the API documentation and fixed it in c13f447

we should re-upload the API docs with this fix

@scpeters scpeters merged commit 53653c3 into sdf9 May 8, 2020
@scpeters scpeters deleted the github_changelog_9 branch May 8, 2020 07:03
scpeters added a commit that referenced this pull request May 12, 2020
Signed-off-by: Louise Poubel <louise@openrobotics.org>

[sdf9] Changelog links to BitBucket backup (#240)

* [sdf9] Changelog links to BitBucket backup

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* [sdf8] Changelog links to BitBucket backup

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* [sdf7] Changelog links to BitBucket backup (#238)

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* Convert bitbucket links for sdf9

Signed-off-by: Steven Peters <scpeters@openrobotics.org>

* Fix link in API documentation

Signed-off-by: Steven Peters <scpeters@openrobotics.org>

Co-authored-by: Steven Peters <scpeters@openrobotics.org>
scpeters added a commit that referenced this pull request May 12, 2020
Signed-off-by: Louise Poubel <louise@openrobotics.org>

[sdf9] Changelog links to BitBucket backup (#240)

* [sdf9] Changelog links to BitBucket backup

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* [sdf8] Changelog links to BitBucket backup

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* [sdf7] Changelog links to BitBucket backup (#238)

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* Convert bitbucket links for sdf9

Signed-off-by: Steven Peters <scpeters@openrobotics.org>

* Fix link in API documentation

Signed-off-by: Steven Peters <scpeters@openrobotics.org>

Co-authored-by: Steven Peters <scpeters@openrobotics.org>
scpeters added a commit to scpeters/sdformat that referenced this pull request May 15, 2020
scpeters added a commit to scpeters/sdformat that referenced this pull request May 15, 2020
…m#268

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit that referenced this pull request May 15, 2020
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit to scpeters/sdformat that referenced this pull request May 15, 2020
…m#268

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit that referenced this pull request May 15, 2020
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit that referenced this pull request Jun 2, 2020
Signed-off-by: Louise Poubel <louise@openrobotics.org>

[sdf9] Changelog links to BitBucket backup (#240)

* [sdf9] Changelog links to BitBucket backup

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* [sdf8] Changelog links to BitBucket backup

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* [sdf7] Changelog links to BitBucket backup (#238)

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* Convert bitbucket links for sdf9

Signed-off-by: Steven Peters <scpeters@openrobotics.org>

* Fix link in API documentation

Signed-off-by: Steven Peters <scpeters@openrobotics.org>

Co-authored-by: Steven Peters <scpeters@openrobotics.org>
scpeters added a commit that referenced this pull request Jun 2, 2020
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
traversaro pushed a commit to traversaro/sdformat that referenced this pull request Sep 5, 2020
* [sdf9] Changelog links to BitBucket backup

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* [sdf8] Changelog links to BitBucket backup

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* [sdf7] Changelog links to BitBucket backup (gazebosim#238)

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* Convert bitbucket links for sdf9

Signed-off-by: Steven Peters <scpeters@openrobotics.org>

* Fix link in API documentation

Signed-off-by: Steven Peters <scpeters@openrobotics.org>

Co-authored-by: Steven Peters <scpeters@openrobotics.org>
traversaro pushed a commit to traversaro/sdformat that referenced this pull request Sep 5, 2020
…m#268

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
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.

3 participants