Skip to content

Merge master dev#54

Merged
cfchase merged 10 commits into
fusor:devfrom
cfchase:merge-master-dev
Jun 1, 2017
Merged

Merge master dev#54
cfchase merged 10 commits into
fusor:devfrom
cfchase:merge-master-dev

Conversation

@cfchase
Copy link
Copy Markdown
Contributor

@cfchase cfchase commented Jun 1, 2017

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

dymurray and others added 10 commits May 16, 2017 16:32
* 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
* 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)
* dev:
  minor formatting for README files (#48)
@cfchase
Copy link
Copy Markdown
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants