Last active
May 6, 2016 17:23
-
-
Save eriknelson/72b6455ca6340e7cfefd9642e44c875c to your computer and use it in GitHub Desktop.
prep_checkouts.sh -s output
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| {> pch/vm_env/git_devel_env_sat_6.2|master+ <} | |
| # ./prep_checkouts.sh -s | |
| Validating forks... | |
| WARNING: Unstaged changes found in fusor | |
| Do you want to stash your changes and continue? [y/n/q] | |
| y | |
| Stashing changes | |
| Saved working directory and index state WIP on test: db847e8 Merge pull request #819 from jmontleon/fix-hostgroup-tests | |
| HEAD is now at db847e8 Merge pull request #819 from jmontleon/fix-hostgroup-tests | |
| WARNING: fusor is not on its master branch | |
| Okay to check out master to sync with upstream? [y/n/q] | |
| y | |
| Switched to branch 'master' | |
| Your branch is up-to-date with 'origin/master'. | |
| WARNING: fusor-installer is not on its master branch | |
| Okay to check out master to sync with upstream? [y/n/q] | |
| y | |
| Switched to branch 'master' | |
| Your branch is behind 'origin/master' by 6 commits, and can be fast-forwarded. | |
| (use "git pull" to update your local branch) | |
| Successfully validated fork state. Beginning sync... | |
| Fetching origin | |
| Fetching upstream | |
| upstream/master -> db847e858a724c090862ee0cce6fb5044991b591 | |
| master -> db847e858a724c090862ee0cce6fb5044991b591 | |
| fusor is up to date. | |
| Fetching origin | |
| Fetching upstream | |
| upstream/master -> c09b01b859956e7bf8b302b7846950ac1b029692 | |
| master -> e880541a878d98645a38cb78230255871e1d7912 | |
| fusor-installer is out of sync! | |
| Updating e880541..c09b01b | |
| Fast-forward | |
| README.md | 2 +- | |
| bin/fusor-installer | 4 +- | |
| config/fusor-devel-installer.answers.yaml | 43 ++++++- | |
| config/fusor-devel-installer.yaml | 155 +++++++++++++++++++++--- | |
| config/fusor-installer.answers.yaml | 73 +++++++---- | |
| config/fusor-installer.yaml | 269 +++++++++++++++++++++++++++-------------- | |
| fusor-installer.spec | 49 ++++---- | |
| hooks/lib/base_seeder.rb | 1 - | |
| hooks/lib/host_seeder.rb | 32 ----- | |
| hooks/lib/provisioning_seeder.rb | 847 ++----------------------------------------------------------------------------------------------------------------------------- | |
| hooks/lib/provisioning_wizard.rb | 28 +++-- | |
| hooks/post/10-setup_provisioning.rb | 8 +- | |
| hooks/pre_validations/10-gather_and_set_fusor_values.rb | 42 ++++--- | |
| modules/foreman/manifests/plugin/fusor_network.pp | 11 -- | |
| 14 files changed, 483 insertions(+), 1081 deletions(-) | |
| delete mode 100644 hooks/lib/host_seeder.rb | |
| Do you want to push to origin? [y/n/q] | |
| y | |
| Everything up-to-date | |
| Fetching origin | |
| Fetching upstream | |
| upstream/master -> fb8c0513f2bd21335e4830c39ed2cd314b30310e | |
| master -> e3995de00f274ee70757d549f181412720d13d79 | |
| foretello_api_v21 is out of sync! | |
| Updating e3995de..fb8c051 | |
| Fast-forward | |
| app/controllers/api/v21/architectures_controller.rb | 2 +- | |
| app/controllers/api/v21/base_controller.rb | 5 ----- | |
| app/controllers/api/v21/common_parameters_controller.rb | 2 +- | |
| app/controllers/api/v21/compute_profiles_controller.rb | 2 +- | |
| app/controllers/api/v21/compute_resources_controller.rb | 2 +- | |
| app/controllers/api/v21/config_groups_controller.rb | 2 +- | |
| app/controllers/api/v21/config_templates_controller.rb | 2 +- | |
| app/controllers/api/v21/discovered_hosts_controller.rb | 2 +- | |
| app/controllers/api/v21/domains_controller.rb | 7 ++++++- | |
| app/controllers/api/v21/environments_controller.rb | 2 +- | |
| app/controllers/api/v21/external_usergroups_controller.rb | 2 +- | |
| app/controllers/api/v21/filters_controller.rb | 2 +- | |
| app/controllers/api/v21/foreman_tasks_controller.rb | 2 +- | |
| app/controllers/api/v21/hostgroups_controller.rb | 7 ++++++- | |
| app/controllers/api/v21/hosts_controller.rb | 2 +- | |
| app/controllers/api/v21/images_controller.rb | 2 +- | |
| app/controllers/api/v21/interfaces_controller.rb | 2 +- | |
| app/controllers/api/v21/lifecycle_environments_controller.rb | 2 +- | |
| app/controllers/api/v21/locations_controller.rb | 2 +- | |
| app/controllers/api/v21/media_controller.rb | 41 ----------------------------------------- | |
| app/controllers/api/v21/models_controller.rb | 28 ---------------------------- | |
| app/controllers/api/v21/operatingsystems_controller.rb | 39 --------------------------------------- | |
| app/controllers/api/v21/organizations_controller.rb | 2 +- | |
| app/controllers/api/v21/parameters_controller.rb | 2 +- | |
| app/controllers/api/v21/ptables_controller.rb | 2 +- | |
| app/controllers/api/v21/puppetclasses_controller.rb | 2 +- | |
| app/controllers/api/v21/realms_controller.rb | 2 +- | |
| app/controllers/api/v21/roles_controller.rb | 2 +- | |
| app/controllers/api/v21/smart_class_parameters_controller.rb | 2 +- | |
| app/controllers/api/v21/smart_proxies_controller.rb | 2 +- | |
| app/controllers/api/v21/smart_variables_controller.rb | 2 +- | |
| app/controllers/api/v21/subnets_controller.rb | 2 +- | |
| app/controllers/api/v21/usergroups_controller.rb | 2 +- | |
| app/controllers/api/v21/users_controller.rb | 2 +- | |
| app/controllers/concerns/api/version21.rb | 8 ++++++++ | |
| app/serializers/discovered_host_serializer.rb | 2 +- | |
| app/serializers/host_base_serializer.rb | 2 +- | |
| app/serializers/root_array_serializer.rb | 3 +++ | |
| config/initializers/active_model_serializer.rb | 1 + | |
| config/routes.rb | 3 +-- | |
| foretello_api_v21.gemspec | 6 ++++-- | |
| lib/foretello_api_v21/engine.rb | 3 ++- | |
| 42 files changed, 61 insertions(+), 150 deletions(-) | |
| create mode 100644 app/serializers/root_array_serializer.rb | |
| create mode 100644 config/initializers/active_model_serializer.rb | |
| Do you want to push to origin? [y/n/q] | |
| y | |
| Everything up-to-date | |
| Fetching origin | |
| Fetching upstream | |
| upstream/master -> d3df26fe75f783900b56d4a2d4c7465d9675120d | |
| master -> d3df26fe75f783900b56d4a2d4c7465d9675120d | |
| egon is up to date. | |
| Fetching origin | |
| Fetching upstream | |
| upstream/master -> 781fead929cfc3ea94193df3356e3f1068d06e81 | |
| master -> 781fead929cfc3ea94193df3356e3f1068d06e81 | |
| fusor_ovirt is up to date. | |
| Fetching origin | |
| Fetching upstream | |
| upstream/master -> c8c5f929c782af0eaefca493d261c984cd30650e | |
| master -> c8c5f929c782af0eaefca493d261c984cd30650e | |
| fusor-utils is up to date. | |
| Sync Report | |
| =========== | |
| Branches changed from: | |
| -> fusor - test | |
| -> fusor-installer - test | |
| Projects with stashed changes: | |
| -> fusor | |
| NOTE: You may want to pop your stash or change back to your working | |
| branch since it's likely you were in the middle of something! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # ./prep_checkouts.sh -s | |
| Validating forks... | |
| ERROR: Attempting to sync fusor when it *has not* been configured for personal forks! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| {> pch/vm_env/git_devel_env_sat_6.2|master+ <} | |
| # ./prep_checkouts.sh -s | |
| Validating forks... | |
| ERROR: /home/ernelson/dev/pch/vm_env/git_devel_env_sat_6.2/../../egon does not already exist | |
| Initialize the project dir with 'prep_checkouts.sh -u USERNAME' before syncing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment