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

Updating REST API samples and readme files #27

Merged
merged 6 commits into from
Apr 24, 2018
Merged

Updating REST API samples and readme files #27

merged 6 commits into from
Apr 24, 2018

Conversation

aaroncarey
Copy link
Contributor

  • Changing the version number throughout: 2.8 -> 3.0
  • Minor updates to formatting in README.md

@aaroncarey aaroncarey requested review from d45 and jdomingu April 23, 2018 23:02
@d45
Copy link
Contributor

d45 commented Apr 23, 2018

Should we be doing a merge with the development branch before opening the PR for master? Looks like they are out of sync. Not sure if that's what we've been doing for this repo. Other repos we typically checki in to the development branch first.

@jdomingu
Copy link
Contributor

@d45 I rebased development from master, so they should be in sync now. Agreed that we have typically pushed to development and then merged to master. This is such a small repo though that maybe we should just get rid of the dev branch and use small feature branches like @aaroncarey has been doing. Let's discuss later (and also talk about deleting the already merged patch branches).

@aaroncarey this seems fine for today's change. 🚀 When you merge, can you use the squash and merge option? Thanks!

@d45
Copy link
Contributor

d45 commented Apr 23, 2018 •
edited
Loading

Sounds good to me. It is a small repo, so simplifying things makes sense. We should definite check with Russ and Lee about the development branch before nuking it.
@aaroncarey @jdomingu - The PR looks good. Jared, do you want to do the merge?

d45
d45 approved these changes Apr 23, 2018
View reviewed changes
Copy link
Contributor

@d45 d45 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@aaroncarey
Copy link
Contributor Author

Thanks to both of you for the review! I'll go ahead and "squash + merge" later this evening when other 2018.1 updates start. And I'll check with Ben / Russell / Lee about the development branch.

I have permissions to merge this PR when we are ready to go.

@aaroncarey aaroncarey merged commit f56a266 into master Apr 24, 2018
@aaroncarey aaroncarey deleted the aaroncarey-patch-1 branch July 26, 2018 20:26
aaroncarey added a commit that referenced this pull request Jul 26, 2018
@aaroncarey
Updating REST API samples and readme files (#27) (#30)
32f639b 
* Update README.md

* Update README.md

* Update version .py (2.8 -> 3.0)

* Updated version numbers, changed the formatting used to refer to files and folders.

* Updated version number from 2.8 to 3.0
aaroncarey added a commit that referenced this pull request Jul 26, 2018
@aaroncarey
Revert "Updating REST API samples and readme files (#27) (#30)"
ee1770d 
This reverts commit 32f639b.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@d45 d45 d45 approved these changes

@jdomingu jdomingu Awaiting requested review from jdomingu

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
@aaroncarey @d45 @jdomingu