Skip to content

Chery pick the viper branch into old structure.#17

Open
bobtfish wants to merge 3 commits intomasterfrom
tdoran/viper
Open

Chery pick the viper branch into old structure.#17
bobtfish wants to merge 3 commits intomasterfrom
tdoran/viper

Conversation

@bobtfish
Copy link
Copy Markdown
Owner

@bobtfish bobtfish commented Mar 9, 2016

@tsheasha I was already doing this ;_)

bobtfish and others added 3 commits March 9, 2016 22:50
Conflicts:
	Gomfile
	aws/manage_route_spec.go
	config/config.go
	config/config_test.go
	daemon/daemon.go
@bobtfish
Copy link
Copy Markdown
Owner Author

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants