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

Refs #11500 - merging host_unification to master #5630

Merged
merged 18 commits into from
Dec 1, 2015
Merged

Refs #11500 - merging host_unification to master #5630

merged 18 commits into from
Dec 1, 2015

Conversation

jlsherrill
Copy link
Member

No description provided.

jlsherrill and others added 17 commits October 6, 2015 11:05
@jlsherrill
Refs #11509,#11510,#11511 - adding content and subscription aspect
cd11348
@jlsherrill
Merge pull request #5495 from jlsherrill/host_uni
eba78ad 
Fixes #11509,#11510,#11511 - adding content and subscription aspect
Merge remote-tracking branch 'origin/master' into merge-master
a98c999
Merge pull request #5519 from thomasmckay/merge-master
c885d72 
Merge master
@jlsherrill
Merge branch 'master' into host_unification
412c882 
Conflicts:
	app/lib/actions/katello/system/create.rb
	app/lib/actions/katello/system/update.rb
	test/actions/katello/system_test.rb
	test/glue/pulp/consumer_test.rb
@jlsherrill
Refs #11506 - adapting facts to host unification
1ef0e81
@jlsherrill
Merge pull request #5556 from jlsherrill/host_unification
6b14273 
Merging master into host unification
Fixes #11500: migrate content hosts to hosts.
ccc3dc7 
http://projects.theforeman.org/issues/11500
Merge pull request #5528 from waldenraines/11500
7e41894 
Fixes #11500: migrate content hosts to hosts.
Merge remote branch 'upstream/master' into host_uniificaiton
3df7271 
Conflicts:
	app/lib/actions/katello/system/create.rb
	app/lib/actions/katello/system/update.rb
	katello.gemspec
	test/actions/katello/system_test.rb
	test/fixtures/vcr_cassettes/pulp/repository/contents.yml
	test/fixtures/vcr_cassettes/pulp/repository/create.yml
	test/fixtures/vcr_cassettes/pulp/repository/operations.yml
	test/fixtures/vcr_cassettes/pulp/repository/puppet.yml
	test/fixtures/vcr_cassettes/pulp/repository/repository.yml
	test/support/fixtures_support.rb
Merge pull request #5613 from waldenraines/host_unification_merge
cdffd71 
Host unification merge
@jlsherrill
Merge remote-tracking branch 'upstream/master' into host_unification
d31891c 
Conflicts:
	app/lib/actions/katello/system/destroy.rb
	test/actions/katello/system_test.rb
	test/controllers/api/v2/systems_controller_test.rb
@jlsherrill
Merge pull request #5626 from jlsherrill/host_uni_merge
5a90d44 
Merging master into host unification
fixes #11513 - hypervisors as hosts
34528e8 
+ moved code from run to finalize
+ wrap task in User.as()
+ duplicate hypervisor names "virt-who-$fqdn-$orgid"
+ changed mock task output
+ updates based on PR comments
+ refactor find host
+ tests
+ rubocop fixes
+ amend author
Merge pull request #5573 from thomasmckay/11513-host-hv
f58b973 
fixes #11513 - hypervisors as hosts
@jlsherrill
Refs #11500 - rename aspects to facets
53673bf
@jlsherrill
Merge pull request #5628 from jlsherrill/facet
88733d0 
Refs #11500 - rename aspects to facets
@waldenraines
Copy link
Contributor

ACK from me, but we may want to get someone not on the host unification team to review.

@waldenraines waldenraines mentioned this pull request Nov 25, 2015
Closed
@johnpmitsch
Copy link
Contributor

I see some minor changes that will have to be made wrt rails4 but nothing that can't be done after merging master into rails4 branch, so I do not think you need to change anything in this PR

@cpeters
Copy link
Contributor

cpeters commented Nov 25, 2015

@johnpmitsch agreed.

ACK

@ehelms ehelms mentioned this pull request Nov 25, 2015
Closed
@jlsherrill
Copy link
Member Author

@ehelms you good with this?

@ehelms
Copy link
Member

ehelms commented Nov 30, 2015

Are there upgrade instructions for this work? Does it require just a DB migrate?

@jlsherrill
Copy link
Member Author

@ehelms just db:migrate

let me rebase to master

@ehelms
Copy link
Member

ehelms commented Dec 1, 2015

ACK for me, passed basic testing and assumptions
On Nov 30, 2015 10:52 PM, "Justin Sherrill" notifications@github.com
wrote:

@ehelms https://github.com/ehelms just db:migrate

let me rebase to master

—
Reply to this email directly or view it on GitHub
#5630 (comment).

@jlsherrill
Merge remote-tracking branch 'upstream/master' into host_unification
18c2908 
Conflicts:
	test/fixtures/vcr_cassettes/pulp/consumer/bind.yml
	test/fixtures/vcr_cassettes/pulp/consumer/consumer.yml
	test/fixtures/vcr_cassettes/pulp/consumer/content.yml
	test/fixtures/vcr_cassettes/pulp/consumer/create.yml
	test/fixtures/vcr_cassettes/pulp/consumer/delete.yml
	test/fixtures/vcr_cassettes/pulp/repository/contents.yml
	test/fixtures/vcr_cassettes/pulp/repository/create.yml
	test/fixtures/vcr_cassettes/pulp/repository/operations.yml
	test/fixtures/vcr_cassettes/pulp/repository/puppet.yml
	test/fixtures/vcr_cassettes/pulp/repository/repository.yml
@theforeman-bot
Copy link

There were the following issues with the commit message:

  • eba78ad must be in the format fixes #redmine_number - brief description.
  • a98c999 must be in the format fixes #redmine_number - brief description.
  • c885d72 must be in the format fixes #redmine_number - brief description.
  • 412c882 must be in the format fixes #redmine_number - brief description.
  • 6b14273 must be in the format fixes #redmine_number - brief description.
  • 7e41894 must be in the format fixes #redmine_number - brief description.
  • 3df7271 must be in the format fixes #redmine_number - brief description.
  • cdffd71 must be in the format fixes #redmine_number - brief description.
  • d31891c must be in the format fixes #redmine_number - brief description.
  • 5a90d44 must be in the format fixes #redmine_number - brief description.
  • f58b973 must be in the format fixes #redmine_number - brief description.
  • 88733d0 must be in the format fixes #redmine_number - brief description.
  • 18c2908 must be in the format fixes #redmine_number - brief description.

If you don't have a ticket number, please create an issue in Redmine, selecting the appropriate project.

More guidelines are available on the Foreman wiki.

This message was auto-generated by Foreman's prprocessor

@jlsherrill
Copy link
Member Author

Merged master back in, only conflicts were vcr cassettes for pulp repo & consumer cassettes. Rerecorded those.

@ehelms
Copy link
Member

ehelms commented Dec 1, 2015

👍

@waldenraines
Copy link
Contributor

@ehelms is that an ACK?

@ehelms
Copy link
Member

ehelms commented Dec 1, 2015

ACK

jlsherrill added a commit that referenced this pull request Dec 1, 2015
@jlsherrill
Merge pull request #5630 from Katello/host_unification
a602aa2 
Refs #11500 - merging host_unification to master
@jlsherrill jlsherrill merged commit a602aa2 into master Dec 1, 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
Needs testing Not yet reviewed Waiting on contributor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jlsherrill @waldenraines @johnpmitsch @cpeters @ehelms @theforeman-bot