search

cognitect-labs / vase

Data driven microservices
Eclipse Public License 1.0
375 stars 41 forks source link

Petstore samples #18

Closed ohpauleez closed 8 years ago

ohpauleez commented 8 years ago

Making a PR to fold in @yokolet's petstore samples.

ohpauleez commented 8 years ago

I'm reviewing all of this right now. Thanks for all the hard work @yokolet

yokolet commented 8 years ago

Thanks for reviewing the apps. If anything needs to change, let me know.

ohpauleez commented 8 years ago

I merged this locally since the diff was rather large (because of all the Swagger assets). Thanks!

yokolet commented 8 years ago

@ohpauleez it looks you didn't merge the latest. It's obvious from README. Would you merge the latest?

ohpauleez commented 8 years ago

I pulled your latest, merged the latest master (you were 5 commits behind), and that's what is currently on master. Did you have local commits you hadn't pushed?

yokolet commented 8 years ago

I'm not sure what's happening, but https://github.com/cognitect-labs/vase/blob/reshape-petstore/samples/pet-store/README.md and https://github.com/cognitect-labs/vase/blob/master/samples/pet-store/README.md are apparently different. Also, this merge show the message "Closed with unmerged commits." So, some of commits have been dropped, I think.

ohpauleez commented 8 years ago

Fixed! That was my bad, sorry about that

yokolet commented 8 years ago

No problem. Everything looks good. Thanks again!

yokolet commented 8 years ago

I'm going to happily click "Delete branch" button.