summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | Dependencies need to be added when a create occurs on SLA object.Kenny Woodson2015-11-121-1/+2
* | | | | | | | Merge pull request #878 from openshift/masterKenny Woodson2015-11-12141-2277/+7305
|\| | | | | | |
| * | | | | | | Merge pull request #875 from kwoodson/itserviceKenny Woodson2015-11-123-1/+317
| |\| | | | | |
| | * | | | | | adding itserviceKenny Woodson2015-11-123-1/+317
| * | | | | | | Automatic commit of package [openshift-ansible] release [3.0.12-1].Brenton Leanhardt2015-11-112-2/+5
| * | | | | | | Merge pull request #873 from sdodson/latest-streamsBrenton Leanhardt2015-11-112-76/+327
| |\ \ \ \ \ \ \
| | * | | | | | | Sync with the latest image streamsScott Dodson2015-11-112-76/+327
| * | | | | | | | Automatic commit of package [openshift-ansible] release [3.0.11-1].Brenton Leanhardt2015-11-112-2/+6
| * | | | | | | | Merge pull request #781 from sdodson/xpaas-1.1Brenton Leanhardt2015-11-1133-1918/+3585
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Migrate xpaas content from pre v1.1.0Scott Dodson2015-11-111-0/+50
| | * | | | | | | | Import latest xpaas templates and image streamsScott Dodson2015-11-1132-1918/+3535
| | |/ / / / / / /
| * | | | | | | | Automatic commit of package [openshift-ansible] release [3.0.10-1].Brenton Leanhardt2015-11-112-2/+10
| * | | | | | | | Merge pull request #872 from detiber/nodeIPWorkaroundBrenton Leanhardt2015-11-111-211/+233
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix update error for templates that didn't previously existJason DeTiberus2015-11-111-1/+8
| | * | | | | | | | General cleanup of v3_0_to_v3_1/upgrade.ymlJason DeTiberus2015-11-111-210/+225
| | |/ / / / / / /
| * | | | | | | | Merge pull request #874 from joelddiaz/s3-slaJoel Diaz2015-11-112-0/+34
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Add zabbix pieces to hold AWS S3 bucket statsJoel Diaz2015-11-112-0/+34
| * | | | | | | Merge pull request #868 from ibotty/oo-filter-dont-failThomas Wiest2015-11-111-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | oo_filter: don't fail when attribute is not definedTobias Florek2015-11-111-1/+1
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge pull request #871 from detiber/fixVagrantDocsBrenton Leanhardt2015-11-111-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | add ansible dep to vagrant docJason DeTiberus2015-11-111-0/+1
| |/ / / / / / /
| * | | | | | | Automatic commit of package [openshift-ansible] release [3.0.9-1].Brenton Leanhardt2015-11-112-2/+5
| * | | | | | | Merge pull request #839 from detiber/refactorUpgradeBrenton Leanhardt2015-11-1130-85/+259
| |\ \ \ \ \ \ \
| | * | | | | | | Refactor upgrade playbook(s)Jason DeTiberus2015-11-1030-85/+259
| | |/ / / / / /
| * | | | | | | Merge pull request #866 from sdodson/openshift-ansible308Brenton Leanhardt2015-11-112-2/+161
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Automatic commit of package [openshift-ansible] release [3.0.8-1].Scott Dodson2015-11-102-2/+161
| |/ / / / / /
| * | | | | | Merge pull request #863 from abutcher/uninstall-clientsBrenton Leanhardt2015-11-101-1/+2
| |\ \ \ \ \ \
| | * | | | | | Add origin-clients to uninstall playbook.Andrew Butcher2015-11-101-1/+2
| |/ / / / / /
| * | | | | | Merge pull request #860 from smunilla/disable_container_based_installBrenton Leanhardt2015-11-102-9/+11
| |\ \ \ \ \ \
| | * | | | | | Update tests now that cli is not asking for rpm/container installSamuel Munilla2015-11-101-2/+2
| | * | | | | | atomic-openshift-installer: Remove question for container installSamuel Munilla2015-11-101-7/+9
| * | | | | | | Merge pull request #857 from sosiouxme/20151110-infrastructure-templatesBrenton Leanhardt2015-11-107-0/+560
| |\ \ \ \ \ \ \
| | * | | | | | | examples: include logging and metrics infrastructureLuke Meyer2015-11-107-0/+560
| | |/ / / / / /
| * | | | | | | Merge pull request #859 from detiber/no_multi_ec2Thomas Wiest2015-11-103-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Remove references to multi_ec2.pyJason DeTiberus2015-11-103-1/+2
| | |/ / / / / /
| * | | | | | | Merge pull request #854 from dgoodwin/pkg-ansible-cfgBrenton Leanhardt2015-11-105-3/+27
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Add separate step to enable services during upgrade.Devan Goodwin2015-11-101-3/+19
| | * | | | | | 1279746: Fix leftover disabled features line in config template.Devan Goodwin2015-11-101-1/+0
| | * | | | | | 1279734: Ensure services are enabled after upgrade.Devan Goodwin2015-11-101-4/+4
| | * | | | | | Fix missing etcd_data_dir bug.Devan Goodwin2015-11-101-0/+6
| | * | | | | | Package the default ansible.cfg with atomic-openshift-utils.Devan Goodwin2015-11-102-1/+4
| |/ / / / / /
| * | | | | | Merge pull request #852 from abutcher/ldap-exampleBrenton Leanhardt2015-11-091-0/+3
| |\ \ \ \ \ \
| | * | | | | | Add ldap auth identity provider to example inventory.Andrew Butcher2015-11-091-0/+3
| * | | | | | | Merge pull request #849 from brenton/test_fixesBrenton Leanhardt2015-11-093-11/+21
| |\ \ \ \ \ \ \
| | * | | | | | | Various fixes related to connect_toBrenton Leanhardt2015-11-093-11/+21
| | |/ / / / / /
| * | | | | | | Merge pull request #848 from dgoodwin/drop-302-reqBrenton Leanhardt2015-11-091-4/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Remove upgrade playbook restriction on 3.0.2.Devan Goodwin2015-11-091-4/+1
| | |/ / / / / /
| * | | | | | | Merge pull request #850 from dgoodwin/etcd-dirBrenton Leanhardt2015-11-093-9/+51
| |\ \ \ \ \ \ \
| | * | | | | | | Read etcd data dir from appropriate config file.Devan Goodwin2015-11-093-9/+51
| | |/ / / / / /
| * | | | | | | Merge pull request #851 from smunilla/scaleup_node_errorBrenton Leanhardt2015-11-091-1/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |