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.

Sign up for GitHub

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

Jump to bottom

Merge master dev #54

Merged
merged 10 commits into from
Jun 1, 2017
Merged

Merge master dev #54

merged 10 commits into from
Jun 1, 2017

Conversation

cfchase
Copy link
Contributor

@cfchase cfchase commented Jun 1, 2017 •
edited
Loading

#53 should have been targeted at dev, not master. Fixing in this PR.

dymurray and others added 10 commits May 16, 2017 16:32
@dymurray @cfchase
Updated to use summit labels (#47)
3c7e187
@jwmatthews
Adds macOS support for local environment (#49)
7ac3481 
* Successful run local on macOS, postgres/python bind worked.

* Reverted asbcli up to use openshift_url variable

* Update README

* Add note 'socat' needs to be installed on mac

* Fix for install asb pip requirements
@jwmatthews
Update README for 2 local directories
0e5b5e5
@jwmatthews
README tweak
7bd3cb3
@cfchase @dymurray
Change to pip install docker instead of the older docker-py (#50)
3ba823a
@cfchase
Merge branch 'master' into merge-master-dev
b146175 
* master:
  Change to pip install docker instead of the older docker-py (#50)
  README tweak
  Update README for 2 local directories
  Adds macOS support for local environment (#49)
  Updated to use summit labels (#47)
@cfchase
Revert "Updated to use summit labels (#47)"
2fe81c3 
This reverts commit 3c7e187.
@cfchase
Minor fixes necessary after merging master.
c174146
@cfchase
Adapting vars_prompt to ec2 and mac.
6f61821
@cfchase
Merge branch 'dev' into merge-master-dev
6b90a2a 
* dev:
  minor formatting for README files (#48)
@cfchase
Copy link
Contributor Author

cfchase commented Jun 1, 2017

@jwmatthews merging since it was tested as part of #53, but let me know if you have any concerns.

@cfchase cfchase merged commit dc144d4 into fusor:dev Jun 1, 2017
@cfchase cfchase deleted the merge-master-dev branch June 1, 2017 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cfchase @dymurray @jwmatthews