Chery pick the viper branch into old structure. #17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: Gomfile aws/manage_route_spec.go config/config.go config/config_test.go daemon/daemon.go
This reverts commit b678513.
|
Currently the integration tests are bust in master :( Probably this is I've fucked nat.conf, but I'd like to see those green (and green for this branch) before I even start considering merging this (I should also read it, the viper docs, and thinks about it a bit first). I'll be back here, but I've just exceeded my allocated hacking time-slice for the day, as it's midnight and I need to ZZzzz ;_) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@tsheasha I was already doing this ;_)