Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #2 from anagy/master

Fixing README.md
  • Loading branch information...
commit d3c14c35270cff473c8df3406e2633a1fb3fb7cc 2 parents cb5e36e + d1848a4
@danmcp danmcp authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 README.md
View
6 README.md
@@ -11,12 +11,12 @@ Create an account at http://openshift.redhat.com/
Create a python-2.6 application and add a MongoDB cartridge to the app
rhc app create -a pythonws -t python-2.6
- rhc app cartridge add -a pythonws -t mongodb-2.0
+ rhc app cartridge add -a pythonws -c mongodb-2.0
Add this upstream flask repo
- cd flask
- git remote add upstream -m master git://github.com/thesteve0/openshift-mongo-flask-example.git
+ cd pythonws
+ git remote add upstream -m master git://github.com/openshift/openshift-mongo-flask-example.git
git pull -s recursive -X theirs upstream master
Then push the repo upstream

1 comment on commit d3c14c3

@thesteve0
Owner

Dan, can you please back out these changes. I had a pull request waiting that would have fixed these. Now I would need to rebase and do it over. I have other fixes I need put in that are now part of the pull request.
Thanks
Steve

Please sign in to comment.
Something went wrong with that request. Please try again.