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

Merge V3 Downstream #218

Closed
wants to merge 609 commits into from
Closed

Merge V3 Downstream #218

wants to merge 609 commits into from

Conversation

richard-cox
Copy link
Member

@richard-cox richard-cox commented Oct 2, 2019

Notes

Nathan Jones and others added 30 commits August 20, 2019 10:52
…-types

* entity-pipeline:
  Fix a few low hanging fruit, added some TODOs for me
  Remove console logs
  FIx qparam for service instances
* v3-master:
  Fix e2e test
  Fix cf init script given changes in broker service (cloudfoundry#3746)
  Update protractor to fix travis e2e tests (cloudfoundry#3747)
  Same Tweaks at space level - Show edit quota on space level quota details page - Ensure we return from edit stepper from org's space quota list, org level quota page and space level quota page - Apply permissions to edit quota
  Tweaks - Show edit quota on org level quota details page - Ensure we return from edit stepper from cf quota list, cf level quota page and org level quota page - Apply permissions to edit quota - Change org --> space in space level quota page - Fix validation for sub 0 values
  Small tweaks
  created unlimited-input comp / refactored quota forms
  org/space quotas: listing and management
…backward-compatibility-action-types

Added backward compatility to old action types
…broken-fav-reducers

Added fav reducers back
- all other cf specific reducers/functions should move out following cloudfoundry#3789
Signed-off-by: Kate E. Reinecke <[email protected]>
* entity-pipeline: (30 commits)
  Tidy up get request action method.
  Small fixes
  Fixed user apce roles data source
  Merge changes
  Fix a few low hanging fruit, added some TODOs for me
  Added backward compatility to old action types
  Added fixme
  Fix e2e test
  Fix cf init script given changes in broker service (cloudfoundry#3746)
  Update protractor to fix travis e2e tests (cloudfoundry#3747)
  Two tweaks - Move entityCatalogue clear into testEntityCatalogue, optionally return test if in test env - Move EffectsFeatureTestModule & TEST_CATALOGUE_ENTITIES into own test file
  Removed some comments
  Fix cf-autoscaler unit tests
  Entity validation fixes
  Same Tweaks at space level - Show edit quota on space level quota details page - Ensure we return from edit stepper from org's space quota list, org level quota page and space level quota page - Apply permissions to edit quota
  Tweaks - Show edit quota on org level quota details page - Ensure we return from edit stepper from cf quota list, cf level quota page and org level quota page - Apply permissions to edit quota - Change org --> space in space level quota page - Fix validation for sub 0 values
  Small tweaks
  WIP
  Fix entity relations from parents test
  Build
  ...
…ve-dupe-reducer

Remove duplicate current-user reducer
* v3-master:
  Remove some duped reducers - all other cf specific reducers/functions should move out following cloudfoundry#3789
* v3-master:
  Temp fix for linting
  Remove some duped reducers - all other cf specific reducers/functions should move out following cloudfoundry#3789
  Fix linting
…e-v2-master

Fix edit quota (includes v2-master merge with other quota fixes)
* v3-master:
  Fix quotas
  Fix post merge
  Temp fix for linting
  Remove some duped reducers - all other cf specific reducers/functions should move out following cloudfoundry#3789
  Fix linting
  Fix three quota issues (cloudfoundry#3782)
  Bump version and add changelog for 2.5 (cloudfoundry#3765)
  Fix SSO tests
  Don't load demo plugin
  Remove demo plugin
  Don't send registration info in query string
  Added fav reducers back
  Don't send username/password in the URL
  Fix bug where setup is not saved and fix /uaa after setup
  Add apache2 utils to nginx package
…metrics

Fix cf metrics & most of autoscaler
* v3-master:
  Fix quotas
  Fix post merge
  Temp fix for linting
  Remove some duped reducers - all other cf specific reducers/functions should move out following cloudfoundry#3789
  Fix linting
  Fix autoscaler events page
  Fix typo
  Removed comments
  Fix multiple autoscaler issues - fix charts view (including metrics tiem range selector) - ensure error is shown correctly on edit failure - ensure 404 error is not shown after policy creation - bug - Fix autoscaler events table cloudfoundry#3783
  Fix metrics - Ensure metrics actions take in endpoint type   - cfMetrics for cf specific actions, downstream metrics will need updating - Fix systemEndpointsReducer (previously was not run) - Fix a cf actions that were using entityFactory
  Fix three quota issues (cloudfoundry#3782)
  Bump version and add changelog for 2.5 (cloudfoundry#3765)
  Fix SSO tests
  Don't load demo plugin
  Remove demo plugin
  Don't send registration info in query string
  Don't send username/password in the URL
  Fix bug where setup is not saved and fix /uaa after setup
  Add apache2 utils to nginx package
…ty-catalogue-fix-cf-unit-tests

Entity Catalogue - Fix cf unit tests & other tweakes
@richard-cox richard-cox added blocked ready for review Ready for review and removed in progress In Progress labels Oct 8, 2019
@KlapTrap
Copy link

KlapTrap commented Oct 8, 2019

Closing in favour of #228

@KlapTrap KlapTrap closed this Oct 8, 2019
@richard-cox richard-cox deleted the initial-migration branch October 20, 2020 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants