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

Keyring vs USS keystore separation #1654

Merged
merged 24 commits into from
Sep 24, 2020
Merged

Keyring vs USS keystore separation #1654

merged 24 commits into from
Sep 24, 2020

Commits on Aug 27, 2020

  1. Add check that keyring mode is set 

    Signed-off-by: stevenhorsman <steven@uk.ibm.com>
    @stevenhorsman
    stevenhorsman committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    0c3d206 View commit details
    Browse the repository at this point in the history

  2. Only run ZWEKRING when that mode is turned on 

    Signed-off-by: stevenhorsman <steven@uk.ibm.com>
    @stevenhorsman
    stevenhorsman committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    ebdcf26 View commit details
    Browse the repository at this point in the history

  3. Add check of keystore mode in create-keyring task 

    Signed-off-by: stevenhorsman <steven@uk.ibm.com>
    @stevenhorsman
    stevenhorsman committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    73747c4 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2020

  1. Merge remote-tracking branch 'origin/staging' into users/stevenh/zip-… 

    …1603

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
    @stevenhorsman
    stevenhorsman committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    f42f2a8 View commit details
    Browse the repository at this point in the history

  2. Only run keyring jcl and setup if in that mode 

    Signed-off-by: stevenhorsman <steven@uk.ibm.com>
    @stevenhorsman
    stevenhorsman committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    bdb7bf7 View commit details
    Browse the repository at this point in the history

  3. Fix indentation 

    Signed-off-by: stevenhorsman <steven@uk.ibm.com>
    @stevenhorsman
    stevenhorsman committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    8002952 View commit details
    Browse the repository at this point in the history

  4. Fix typo 

    Signed-off-by: stevenhorsman <steven@uk.ibm.com>
    @stevenhorsman
    stevenhorsman committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    479fdd8 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2020

  1. Merge remote-tracking branch 'origin/staging' into users/stevenh/zip-… 

    …1603
    @stevenhorsman
    stevenhorsman committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    c632289 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2020

  1. Temp skip some keyring test to improve speed 

    Signed-off-by: stevenhorsman <steven@uk.ibm.com>
    @stevenhorsman
    stevenhorsman committed Sep 14, 2020
    Configuration menu
    Copy the full SHA
    400bc67 View commit details
    Browse the repository at this point in the history

  2. Re-add overloading fix 

    Signed-off-by: stevenhorsman <steven@uk.ibm.com>
    @stevenhorsman
    stevenhorsman committed Sep 14, 2020
    Configuration menu
    Copy the full SHA
    a215fef View commit details
    Browse the repository at this point in the history

  3. Add debug 

    Signed-off-by: stevenhorsman <steven@uk.ibm.com>
    @stevenhorsman
    stevenhorsman committed Sep 14, 2020
    Configuration menu
    Copy the full SHA
    14a5858 View commit details
    Browse the repository at this point in the history

  4. swtich condition 

    Signed-off-by: stevenhorsman <steven@uk.ibm.com>
    @stevenhorsman
    stevenhorsman committed Sep 14, 2020
    Configuration menu
    Copy the full SHA
    1dfd19f View commit details
    Browse the repository at this point in the history

  5. Undo debug changes 

    Signed-off-by: stevenhorsman <steven@uk.ibm.com>
    @stevenhorsman
    stevenhorsman committed Sep 14, 2020
    Configuration menu
    Copy the full SHA
    9c00bcc View commit details
    Browse the repository at this point in the history

  6. Remove comments that apply to keyring 

    Signed-off-by: stevenhorsman <steven@uk.ibm.com>
    @stevenhorsman
    stevenhorsman committed Sep 14, 2020
    Configuration menu
    Copy the full SHA
    e4cd215 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2020

  1. Merge branch 'staging' into users/stevenh/zip-1603

    @stevenhorsman
    stevenhorsman authored Sep 15, 2020
    Configuration menu
    Copy the full SHA
    e7e3d5b View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2020

  1. Attempt to increase timeout 

    Signed-off-by: stevenhorsman <steven@uk.ibm.com>
    @stevenhorsman
    stevenhorsman committed Sep 16, 2020
    Configuration menu
    Copy the full SHA
    42df4d8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'staging' into users/stevenh/zip-1603

    @stevenhorsman
    stevenhorsman authored Sep 16, 2020
    Configuration menu
    Copy the full SHA
    4f55d57 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'staging' into users/stevenh/zip-1603

    @stevenhorsman
    stevenhorsman authored Sep 16, 2020
    Configuration menu
    Copy the full SHA
    6487d9c View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2020

  1. Merge branch 'staging' into users/stevenh/zip-1603

    @stevenhorsman
    stevenhorsman authored Sep 18, 2020
    Configuration menu
    Copy the full SHA
    a065415 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2020

  1. Merge branch 'staging' into users/stevenh/zip-1603

    @stevenhorsman
    stevenhorsman authored Sep 21, 2020
    Configuration menu
    Copy the full SHA
    b7cb20f View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2020

  1. Merge branch 'staging' into users/stevenh/zip-1603

    @stevenhorsman
    stevenhorsman authored Sep 23, 2020
    Configuration menu
    Copy the full SHA
    6cb31a9 View commit details
    Browse the repository at this point in the history

  2. Add default keyrign name 

    Signed-off-by: stevenhorsman <steven@uk.ibm.com>
    @stevenhorsman
    stevenhorsman committed Sep 23, 2020
    Configuration menu
    Copy the full SHA
    84fb47c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'staging' into users/stevenh/zip-1603

    @stevenhorsman
    stevenhorsman authored Sep 23, 2020
    Configuration menu
    Copy the full SHA
    05cdb39 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2020

  1. Merge branch 'staging' into users/stevenh/zip-1603

    @stevenhorsman
    stevenhorsman authored Sep 24, 2020
    Configuration menu
    Copy the full SHA
    2f8a87c View commit details
    Browse the repository at this point in the history