Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Merging kubernetesmastervarsvmss into kubernetesmastervars #4116

Merged
merged 12 commits into from
Nov 1, 2018
Merged

Merging kubernetesmastervarsvmss into kubernetesmastervars #4116

merged 12 commits into from
Nov 1, 2018

Commits on Oct 24, 2018

  1. merging kubernetesmastervarsvmss into kubernetesmastervars

    tariqibrahim committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    e42999d View commit details
    Browse the repository at this point in the history

  2. merging k8scustomdata yamls 

    Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
    tariqibrahim committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    38ffb0e View commit details
    Browse the repository at this point in the history

  3. merging k8scustomdata yamls 

    Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
    tariqibrahim committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    ff3cf71 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/Azure/acs-engine into mer… 

    …ge_templates
    tariqibrahim committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    617554a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'merge_templates' of github.com:tariq1890/acs-engine int… 

    …o merge_templates
    tariqibrahim committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    176f30a View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2018

  1. Merge branch 'master' of https://github.com/Azure/acs-engine into mer… 

    …ge_templates
    tariqibrahim committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    01d01ad View commit details
    Browse the repository at this point in the history

  2. Fix merging bugs

    tariqibrahim committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    21d1b0c View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2018

  1. Merge branch 'master' of https://github.com/Azure/acs-engine into mer… 

    …ge_templates
    tariqibrahim committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    32ee26b View commit details
    Browse the repository at this point in the history

  2. Deleting unused templates

    tariqibrahim committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    0425d6b View commit details
    Browse the repository at this point in the history

  3. Deleting unused templates and vars

    tariqibrahim committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    a0eec3f View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2018

  1. rebase and merge

    tariqibrahim committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    99dc20e View commit details
    Browse the repository at this point in the history

  2. merging k8scustomdata yamls - addressing review comments 

    Signed-off-by: tariqibrahim <tariq.ibrahim@microsoft.com>
    tariqibrahim committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    9c5fea9 View commit details
    Browse the repository at this point in the history