fixes wait_for_service and bonds storage

osrf / capabilities

Implements the concept of capabilities as part of the robots-in-concert system.

Other

8 stars 26 forks source link

fixes wait_for_service and bonds storage #40

Closed bit-pirate closed 10 years ago

bit-pirate commented 10 years ago

Few fixes for bugs I ran into, when testing the reference counting implementation (refs #19)

wjwwood commented 10 years ago

You need to rebase so that this pull request include commit b1a2abe99e807181612c6ed5ac4e6f5aa14fb357, which fixes continuous integration.

bit-pirate commented 10 years ago

That commit has been added. What is the rebase for? Do you want me to rebase to squash the commit?

wjwwood commented 10 years ago

You should have rebased against issue_19, that would have put the commit in the proper place, now it cannot be merged because it conflicts. Do this:

Remove the commit you added: git reset --hard 30e51d8
Rebase against issue_19: git rebase origin/issue_19
Push to your branch: git push bit-pirate issue_19 -f

bit-pirate commented 10 years ago

Thanks for the detailed explanation! Does the updated PR do what you want?

Your travis fixes are included, but Travis still complains:

The command "pip install nose coverage pep8 PyYAML catkin_pkg rospkg empy==latest python-coveralls --use-mirrors" failed and exited with 1 during install.

esteve commented 10 years ago

@bit-pirate Could you rebase again? @wjwwood fixed a bug in master regarding the empy version

Thanks.

coveralls commented 10 years ago

Coverage remained the same when pulling 9762c8bf8ef6d1bca8e3295ae4f3f35dcdc238bf on bit-pirate:issue_19 into 65d9d7056531689b1bd9b8ea387c469bc3d9582a on osrf:issue_19.

bit-pirate commented 10 years ago

@bit-pirate Could you rebase again?

I think you guys are enjoying this! :wink:

Rebase done.

wjwwood commented 10 years ago

@bit-pirate yeah, I put a work around in for empy and pip 1.4.1, but then we contacted the guy who maintains empy and he fixed it, which broke my workaround so yeah...