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

Add max_resource_units to enterprise license #50735

Merged
merged 12 commits into from
Jan 13, 2020
Merged

Add max_resource_units to enterprise license #50735

merged 12 commits into from
Jan 13, 2020

Commits on Jan 8, 2020

  1. Add max_resource_units to enterprise license 

    The enterprise license type must has "max_resource_units" and may not
have "max_nodes".

This change adds support for this new field, validation that the field
is present if-and-only-if the license is enterprise and bumps the
license version number to reflect the new field.
    @tvernum
    tvernum committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    71f029a View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2020

  1. Fix compatible license versions

    @tvernum
    tvernum committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    0bcba71 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into enterprise-license/max_resource_units

    @tvernum
    tvernum committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    7a26ca3 View commit details
    Browse the repository at this point in the history

  3. Fix some tests

    @tvernum
    tvernum committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    3019233 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into enterprise-license/max_resource_units

    @tvernum
    tvernum committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    0c03b5c View commit details
    Browse the repository at this point in the history

  5. Add max_resource_units to monitoring test

    @tvernum
    tvernum committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    8147c82 View commit details
    Browse the repository at this point in the history

  6. Fix docs snippet

    @tvernum
    tvernum committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    1cfc630 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2020

  1. Update Rest tests

    @tvernum
    tvernum committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    736057a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into enterprise-license/max_resource_units

    @tvernum
    tvernum committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    f3c54d6 View commit details
    Browse the repository at this point in the history

  3. Fix self generated (trial) enterprise licenses

    @tvernum
    tvernum committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    c7e537d View commit details
    Browse the repository at this point in the history

  4. Fix another broken test

    @tvernum
    tvernum committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    a02c11d View commit details
    Browse the repository at this point in the history

  5. Update validation messages

    @tvernum
    tvernum committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    fbfe58c View commit details
    Browse the repository at this point in the history