summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5129 from maxamillion/fedora-compatOpenShift Merge Robot2017-10-102-3/+39
|\
| * rebase on masterAdam Miller2017-10-061-1/+1
| * Add fedora compatibilityAdam Miller2017-10-062-4/+40
* | Merge pull request #5693 from nhosoi/bz1490647OpenShift Merge Robot2017-10-101-3/+9
|\ \
| * | Bug 1490647 - logging-fluentd deployed with openshift_logging_use_mux=false f...Noriko Hosoi2017-10-101-3/+9
* | | Merge pull request #5645 from jmencak/tuned-role-lbOpenShift Merge Robot2017-10-1011-9/+25
|\ \ \ | |/ / |/| |
| * | Separate tuned daemon setup into a role.Jiri Mencak2017-10-1011-9/+25
* | | Merge pull request #5585 from nak3/bz#1496593OpenShift Merge Robot2017-10-101-3/+3
|\ \ \
| * | | Add valid search when search does not exist on resolv.confKenjiro Nakayama2017-09-291-3/+3
* | | | Merge pull request #5711 from giuseppe/docker-crio-expect-openshiftrelease-wi...Scott Dodson2017-10-102-2/+2
|\ \ \ \
| * | | | crio, docker: expect openshift_release to have 'v'Giuseppe Scrivano2017-10-102-2/+2
| | |/ / | |/| |
* | | | Merge pull request #5713 from mtnbikenc/fix-inventoryScott Dodson2017-10-101-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typo in inventory exampleRussell Teague2017-10-101-2/+2
|/ / /
* | | Automatic commit of package [openshift-ansible] release [3.7.0-0.147.0].Jenkins CD Merge Bot2017-10-102-2/+13
* | | Merge pull request #5695 from giuseppe/image_tag_default_to_releaseOpenShift Merge Robot2017-10-093-13/+35
|\ \ \
| * | | crio, docker: use openshift_release when openshift_image_tag is not usedGiuseppe Scrivano2017-10-093-12/+34
| * | | crio: fix typoGiuseppe Scrivano2017-10-091-1/+1
* | | | Merge pull request #5698 from abutcher/servinginfo-client-caOpenShift Merge Robot2017-10-092-6/+2
|\ \ \ \
| * | | | Ensure servingInfo.clientCA is set as ca.crt rather than ca-bundle.crt.Andrew Butcher2017-10-092-6/+2
* | | | | Merge pull request #5368 from jianlinliu/bz1490738Scott Dodson2017-10-091-2/+2
|\ \ \ \ \
| * | | | | Update registry_config.j2Jianlin Liu2017-09-121-1/+1
| * | | | | Update registry_config.j2Jianlin Liu2017-09-121-1/+1
* | | | | | Merge pull request #5705 from mgugino-upstream-stage/docker-partof-iptablesScott Dodson2017-10-091-0/+6
|\ \ \ \ \ \
| * | | | | | Add PartOf to docker systemd service unit.Michael Gugino2017-10-091-0/+6
* | | | | | | Merge pull request #5699 from giuseppe/crio-use-systemdOpenShift Merge Robot2017-10-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | crio: use systemd managerGiuseppe Scrivano2017-10-091-1/+1
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.146.0].Jenkins CD Merge Bot2017-10-092-2/+6
* | | | | | | Merge pull request #5650 from mgugino-upstream-stage/skopeo-auth-credsOpenShift Merge Robot2017-10-093-83/+76
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | docker_image_availability: credentials to skopeoMichael Gugino2017-10-063-83/+76
* | | | | | | Merge pull request #5682 from tbielawa/openshift_managementScott Dodson2017-10-0946-341/+351
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Rename openshift_cfme role to openshift_managementTim Bielawa2017-10-0646-341/+351
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.145.0].Jenkins CD Merge Bot2017-10-092-2/+12
* | | | | | | Merge pull request #5696 from ingvagabund/add-missing-handler-to-flannelJan Chaloupka2017-10-091-0/+9
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | add missing restart node handler to flannelJan Chaloupka2017-10-091-0/+9
|/ / / / / /
* | | | | | Merge pull request #5684 from enj/enj/i/configmap_lockOpenShift Merge Robot2017-10-071-0/+5
|\ \ \ \ \ \
| * | | | | | Switch to configmap leader election on 3.7 upgradeMonis Khan2017-10-061-0/+5
| |/ / / / /
* | | | | | Merge pull request #5661 from giuseppe/crio-use-overlay-instead-of-overlay2OpenShift Merge Robot2017-10-071-3/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | crio.conf.j2: sync from upstreamGiuseppe Scrivano2017-10-061-1/+23
| * | | | | cri-o: use overlay instead of overlay2Giuseppe Scrivano2017-10-061-2/+2
| |/ / / /
* | | | | Merge pull request #5680 from mgugino-upstream-stage/ensure-docker-restarts-w...OpenShift Merge Robot2017-10-062-1/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Ensure docker is restarted when iptables is restartedMichael Gugino2017-10-062-1/+4
* | | | | Merge pull request #5660 from sdodson/one-exampleScott Dodson2017-10-062-970/+30
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Stop including origin and ose hosts example fileScott Dodson2017-10-062-970/+30
|/ / / /
* | | | Merge pull request #4820 from dcbw/revert-change-requires-to-wants-openvswitchOpenShift Merge Robot2017-10-062-0/+2
|\ \ \ \
| * | | | node: make node service PartOf=openvswitch.service when openshift-sdn is usedDan Williams2017-10-052-0/+2
| |/ / /
* | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.144.0].Jenkins CD Merge Bot2017-10-062-2/+47
* | | | Merge pull request #5679 from mgugino-upstream-stage/fix-etcd-typoScott Dodson2017-10-051-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | fix typo for default in etcdMichael Gugino2017-10-051-1/+1
|/ / /
* | | Merge pull request #5673 from ewolinetz/bz1497041Scott Dodson2017-10-051-1/+1
|\ \ \
| * | | Bumping version of service catalog image for 3.7Eric Wolinetz2017-10-051-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 20:21:52 +0000