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.

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

Add provider compliance events to Events appendix. #223

Closed
wants to merge 15 commits into from

Conversation

cben
Copy link
Contributor

@cben cben commented Feb 8, 2017

These events have appeared in euwe release:
https://bugzilla.redhat.com/show_bug.cgi?id=1411337 (master)
https://bugzilla.redhat.com/show_bug.cgi?id=1411364 (euwe)

They originally were called "ExtManagementSystem Compliance" in the UI but that's a mistake, corrected to "Provider" in ManageIQ/manageiq#13388 (on master & euwe/backported).

hayesr and others added 15 commits October 12, 2016 09:32
- Updated Versioning page to talk about v2.3.0 and its features
- /api/automate model queries
- /api/automate_domains queries and related actions
- OPTIONS on /api/:collection for fetching collection metadata
- Service Power operations
- Picture Creation via /api/pictures
- Deleting Service Dialogs
- Bulk Queries
- /api/notifications Support
- /api/blueprints Support and Tagging
- Provider custom attributes
- Entrypoint Details
- /api/arbitration_profiles CRUD
- /api/arbitration_rules CRUD
- /api/arbitration_settings CRUD
- /api/virtual_templates Queries
- Cloud Networks subcollection of Providers
- Service Creation
- /api/orchestration_templates CRUD
- Renamed/Removed Deprecated Attributes
- Approving/Denying service requests
- /api/requests Create/Edit/Approve/Deny
- JSON syntax fix
- Options metadata details
- Incorrect wording in bulk query page
- Italicized anded and or in filtering page
Changed to a note box and other edits.
@simon3z
Copy link

simon3z commented Feb 20, 2017

@cben who should look at this?

@cben
Copy link
Contributor Author

cben commented Feb 20, 2017

Dunno, someone on the Docs team? ;-)
@suyogsainkar you've worked on extending policy docs (for container entities) a while back. Can you take a look, this is a tiny addition?

@suyogsainkar
Copy link
Contributor

suyogsainkar commented Feb 20, 2017

@cben Hi Beni, the additions are looking good to me. However, changing the base branch to Euwe picked up other commits resulting in conflicts. I've created and merged a separate PR with these changes: #231 Please close the original PR.

@suyogsainkar suyogsainkar changed the base branch from master to euwe February 20, 2017 23:22
@cben
Copy link
Contributor Author

cben commented Feb 22, 2017

Thanks.
Note when I said "These events have appeared in euwe release" I meant they're present since euwe but also on master.
So I think you'll also want this addition on docs master?

@cben cben closed this Feb 22, 2017
@cben cben changed the base branch from euwe to master February 22, 2017 13:56
@simon3z
Copy link

simon3z commented Feb 22, 2017

Thanks.
Note when I said "These events have appeared in euwe release" I meant they're present since euwe but also on master.
So I think you'll also want this addition on docs master?

@cben yes of course, so please keep this open and get it merged. cc @suyogsainkar

@cben cben reopened this Feb 22, 2017
@suyogsainkar
Copy link
Contributor

suyogsainkar commented Feb 22, 2017

@cben @simon3z I know it might seem confusing, but euwe is our docs master upstream in GitHub; changes there get synced with the downstream master in GitLab. Likewise, if you have a change for 4.1, submit pull requests against the upstream darga branch, which will be sycned with the downstream 4.1 branch.

@simon3z
Copy link

simon3z commented Feb 23, 2017

@cben @simon3z I know it might seem confusing, but euwe is our docs master upstream in GitHub; changes there get synced with the downstream master in GitLab. Likewise, if you have a change for 4.1, submit pull requests against the upstream darga branch, which will be sycned with the downstream 4.1 branch.

@suyogsainkar and where the F-release will be branched from?

@simon3z
Copy link

simon3z commented Mar 1, 2017

Ping @suyogsainkar
@miq-bot assign suyogsainkar

@suyogsainkar
Copy link
Contributor

@simon3z My apologies for the delay in getting back. @adahms, who manages branches in the docs repo, has agreed to respond to your query.

@adahms
Copy link
Contributor

adahms commented Mar 3, 2017

@suyogsainkar Thank you for adding me to this thread!

@simon3z Thank you for your question - the 'euwe' branch has the most up-to-date content from that release, and would make a good candidate for branching for the F-release. Would that be acceptable?

@Fryguy See the above question, Jason - we will be looking to create a branch in the next week to start work on this content if possible, but I am open to branching in a different way if you have any preferences.

@Fryguy
Copy link
Member

Fryguy commented Mar 21, 2017

@adahms I didn't see your message here, but I answered you via email. For everyone else's benefit, I'll copy it here...

Master branch is the F release so I would expect PRs to master to be good enough, unless I'm missing something (This is how all of the other repos work). I'd prefer we didn't branch until all of the other repos have branched otherwise it makes our downstream mirror and tagging scripts not work.

Note that the information for planned branching for the Fine release can be found here: http://talk.manageiq.org/t/coming-soon-fine-branch/2189

@simon3z
Copy link

simon3z commented Mar 22, 2017

@Fryguy based on your comment it seems to me that this should be merged here.
Can anyone do that? (cc @adahms)

@adahms
Copy link
Contributor

adahms commented Mar 23, 2017

@simon3z - I'd be happy to take a look and merge this PR for you. I will only have time in the next few days, but will set aside some time to take a look.

@Fryguy
Copy link
Member

Fryguy commented Mar 27, 2017

@simon3z @cben Even so, the PR itself looks busted because there are a bunch of unrelated commits in the PR.

@miq-bot
Copy link
Member

miq-bot commented Mar 29, 2017

Checked commit cben@7a11322 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
0 files checked, 0 offenses detected
Everything looks good. 🍪

@cben
Copy link
Contributor Author

cben commented Mar 30, 2017

Oh, b891935 from #231 is already both on euwe and master, so nothing more to do.

Apparently master was branched from euwe at 076c811.

@cben cben closed this Mar 30, 2017
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.

9 participants