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

Policies do not merge #39

Merged
merged 45 commits into from
Nov 18, 2015
Merged

Policies do not merge #39

merged 45 commits into from
Nov 18, 2015

Conversation

iPablo
Copy link
Contributor

@iPablo iPablo commented Nov 13, 2015

Fix #20

iPablo and others added 30 commits October 19, 2015 08:33
@iPablo
Added new test
d1113ac
@iPablo
Merge branch 'development' of https://github.com/Emergya/gecoscc-ui i…
a14c4d9 
…nto policies-do-not-merge
@iPablo
Changes in cookbook and command for new improvements
7b256f2
@iPablo
Rename variables name
2323523
@iPablo
Improvements in testcookbook
7df97da
@iPablo
Add new tests and improvements
c60a3ff
@iPablo
Add first version to merge ous and groups polciies
74b1c67
@iPablo
Policies mergeables with user and groups
3d85a3f
@iPablo
Improve Tests
c8097f0
@iPablo
Improve tests
bed1f6e
@iPablo
Mergeables object related policies
bb9b896
@iPablo
Software profiles now merged
578a8a6
@iPablo
Merge branch 'remove-emiter-policies' into policies-do-not-merge
a87078c
@iPablo
Improve code
6994c67
@iPablo
Refactor code
44be1c8
@iPablo
Add new tests and improve tests
45fdf85
@iPablo
Merge branch 'software-profile-out-of-scope' into policies-do-not-merge
3850a4f
@iPablo
Modified policies importer policies
147cad0
@albluqmun
Added merge/unmerge policy icon
10f91ac
@albluqmun
Merge branch 'policies-do-not-merge' of github.com:Emergya/gecoscc-ui…
47db612 
… into policies-do-not-merge
@albluqmun
Merge branch 'policies-do-not-merge' of github.com:Emergya/gecoscc-ui…
c1b2942 
… into policies-do-not-merge
@iPablo
Code refactor
69a2764
@iPablo
Merge branch 'policies-do-not-merge' of https://github.com/Emergya/ge…
aa75a38 
…coscc-ui into policies-do-not-merge
@iPablo
Code refactored
6d78e91
@iPablo
Code refactored
812e589
@iPablo
add field is_mergeable to policies in test_resources:cookbook
e261010
@albluqmun
Merge branch 'policies-do-not-merge' of github.com:Emergya/gecoscc-ui…
35b0d20 
… into policies-do-not-merge
@albluqmun
Added title for mergeable/unmergeable policies icons
2929dda
@iPablo
refactored and improved code
e6986e0
@iPablo
Code improvements
fbe1096
@iPablo iPablo mentioned this pull request Nov 13, 2015
Closed
alfem
alfem reviewed Nov 17, 2015
View reviewed changes
gecoscc/commands/recalc_nodes_policies.py
def command(self):
'''
This command recalculate the policies of the selected nodes
These nodes are receiving as command arguments
Copy link
Member

Choose a reason for hiding this comment

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

"receiving" should be "received"

alfem added a commit that referenced this pull request Nov 18, 2015
@alfem
Merge pull request #39 from Emergya/policies-do-not-merge
93ed87d 
Policies do not merge solved
@alfem alfem merged commit 93ed87d into gecos-team:development Nov 18, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@iPablo @alfem @albluqmun @goinnn