Skip to content
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.

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

tortoise evict under pbase #797

Merged
merged 16 commits into from Apr 17, 2019

Conversation

Projects
None yet
3 participants
@almogdepaz
Copy link
Member

commented Apr 8, 2019

No description provided.

@almogdepaz almogdepaz changed the title #553 tortoise out of window Apr 8, 2019

@almogdepaz almogdepaz requested a review from zalmen Apr 8, 2019

@almogdepaz almogdepaz marked this pull request as ready for review Apr 8, 2019

@almogdepaz almogdepaz requested a review from barakshani Apr 8, 2019

almogdepaz added some commits Apr 8, 2019

Show resolved Hide resolved tortoise/ninja_tortoise.go Outdated

almogdepaz added some commits Apr 8, 2019

Merge branch 'develop' into tortoise_window
# Conflicts:
#	cmd/node/node.go
#	tortoise/ninja_tortoise.go
#	tortoise/ninja_tortoise_test.go

@almogdepaz almogdepaz changed the title tortoise out of window tortoise evict under pbase Apr 10, 2019

almogdepaz added some commits Apr 14, 2019

Merge branch 'develop' into tortoise_window
# Conflicts:
#	cmd/node/node.go
Show resolved Hide resolved mesh/meshdb.go Outdated
Show resolved Hide resolved tortoise/ninja_tortoise.go Outdated
Show resolved Hide resolved tortoise/ninja_tortoise.go Outdated
Show resolved Hide resolved tortoise/ninja_tortoise.go

almogdepaz added some commits Apr 16, 2019

@almogdepaz almogdepaz requested a review from zalmen Apr 16, 2019

@zalmen

zalmen approved these changes Apr 17, 2019

@almogdepaz almogdepaz merged commit 0d2a48f into develop Apr 17, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@almogdepaz almogdepaz deleted the tortoise_window branch Apr 17, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.