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

Feature/houston api integration #60

Merged
merged 16 commits into from May 9, 2018
Merged

Conversation

andscoop
Copy link
Contributor

@andscoop andscoop commented May 8, 2018

No description provided.

@schnie
Copy link
Member

schnie commented May 9, 2018

LGTM

@schnie
Copy link
Member

schnie commented May 9, 2018

@andscoop looks like there may be some merge conflicts. Can you rebase master onto the branch and clean up any conflicts?

@andscoop
Copy link
Contributor Author

andscoop commented May 9, 2018

@schnie Will do, @cwurtz and I were experiencing some strange git issues while pairing earlier this afternoon, we held off on rushing it in. This is my priority first thing tomorrow morning.

cwurtz added 2 commits May 9, 2018 11:09
# Conflicts:
#	airflow/airflow.go
#	auth/auth.go
#	cmd/airflow.go
#	config/config.go
@cwurtz cwurtz merged commit 1c5d3f7 into master May 9, 2018
@cwurtz cwurtz deleted the feature/houston-api-integration branch May 9, 2018 15:14
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.

None yet

3 participants