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

Fixes #12843: UI enhancement for API ACL selection #56

Conversation

RaphaelGauthier
Copy link
Member

Copy link
Member

@fanf fanf left a comment

Choose a reason for hiding this comment

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

Perfect!
We will wait to merge the other for 4.3.3 and then this one.

@fanf
Copy link
Member

fanf commented Jul 6, 2018

OK, you can "rudder-dev rebase" and remove the two now unused commit!

@RaphaelGauthier RaphaelGauthier force-pushed the ust_12843/ui_enhancement_for_api_acl_selection branch from 5653820 to ef2a3ed Compare July 6, 2018 15:45
@Normation-Quality-Assistant
Copy link
Contributor

This PR breaks qa-test

-- stdout -- 
Your branch is behind 'NRM/branches/rudder/4.3' by 5 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
Updating 6337488..1f8f2e7
Fast-forward
[...]
 * [new branch]      ust_12843/ui_enhancement_for_api_acl_selection -> ust_12843/ui_enhancement_for_api_acl_selection_pr
From github.com:Normation/rudder-plugins
   58b2ec7..c79cf3b  branches/rudder/4.1 -> NRM/branches/rudder/4.1
   216dd51..a22433d  branches/rudder/4.2 -> NRM/branches/rudder/4.2
   5e3a96d..1f8f2e7  branches/rudder/4.3 -> NRM/branches/rudder/4.3
   cfc68ef..68c4aac  master              -> NRM/master
Switched to branch 'branches/rudder/4.3'
Switched to a new branch '4.3_test'
No config file found, using default configuration

You should run ./qa-test in your repository to make sure it works.
You can also run rudder-dev merge https://github.com/Normation/rudder-plugins/pull/56 --test to test with upmerging.
After this, you can remove the qa: Can't merge ta
-- Your faithful QA

@fanf
Copy link
Member

fanf commented Jul 9, 2018

OK, merging this PR

@fanf fanf merged commit ef2a3ed into Normation:branches/rudder/4.3 Jul 9, 2018
@fanf
Copy link
Member

fanf commented Jul 9, 2018

OK, merging this PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants