Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4349 from sdodson/bz1392519 | Scott Dodson | 2017-06-07 | 1 | -5/+7 |
|\ | |||||
| * | Do not attempt to override openstack nodename | Jason DeTiberus | 2017-06-01 | 1 | -5/+7 |
* | | Merge pull request #4331 from stevekuznetsov/skuznets/update-is | Scott Dodson | 2017-06-07 | 2 | -8/+40 |
|\ \ | |||||
| * | | Update image stream to openshift/origin:2c55ade | Steve Kuznetsov | 2017-05-31 | 2 | -8/+40 |
* | | | Merge pull request #4278 from abutcher/loopback-kubeconfig | OpenShift Bot | 2017-06-07 | 3 | -3/+38 |
|\ \ \ | |||||
| * | | | Use local openshift.master.loopback_url when generating initial master loopba... | Andrew Butcher | 2017-06-02 | 3 | -3/+38 |
* | | | | Merge pull request #4327 from ewolinetz/fix_logging_secret | OpenShift Bot | 2017-06-06 | 3 | -6/+8 |
|\ \ \ \ | |||||
| * | | | | Updating Kibana-proxy secret key name, fixing deleting secrets, fixed extra E... | ewolinetz | 2017-05-31 | 3 | -6/+8 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3643 from juanvallejo/jvallejo/elastic-search-check | OpenShift Bot | 2017-06-06 | 13 | -6/+1575 |
|\ \ \ \ | |||||
| * | | | | add elasticseatch, fluentd, kibana check | juanvallejo | 2017-06-02 | 13 | -6/+1575 |
* | | | | | Merge pull request #4348 from tbielawa/bz1451693 | OpenShift Bot | 2017-06-05 | 2 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Add daemon_reload parameter to service tasks | Tim Bielawa | 2017-06-01 | 2 | -0/+2 |
* | | | | | | Merge pull request #4342 from richm/mux-uses-fluentd-secret | OpenShift Bot | 2017-06-05 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | mux uses fluentd cert/key to talk to ES | Rich Megginson | 2017-05-31 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #4267 from ozdanborne/byo-etcd | OpenShift Bot | 2017-06-05 | 7 | -23/+52 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Support byo etcd for calico | Dan Osborne | 2017-05-24 | 7 | -23/+52 |
* | | | | | | | Merge pull request #4064 from juanvallejo/jvallejo/add-ovs-version-check | OpenShift Bot | 2017-06-05 | 4 | -92/+334 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove unnecessary comment. | Rodolfo Carvalho | 2017-05-24 | 1 | -1/+1 |
| * | | | | | | | update aos_version module to support generic pkgs and versions | juanvallejo | 2017-05-24 | 4 | -91/+333 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #4157 from juanvallejo/jvallejo/add-retroactive-ovs-versio... | OpenShift Bot | 2017-06-05 | 4 | -0/+376 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add existing_ovs_version check | juanvallejo | 2017-05-19 | 5 | -0/+377 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #4336 from sdodson/BZ1457062 | OpenShift Bot | 2017-06-05 | 2 | -0/+18 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add mtu setting to /etc/sysconfig/docker-network | Scott Dodson | 2017-06-01 | 2 | -0/+18 |
* | | | | | | | | Merge pull request #4309 from ingvagabund/disable-docker-excluder-when-updating | OpenShift Bot | 2017-06-02 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | disable docker excluder before it is updated to remove older excluded packages | Jan Chaloupka | 2017-05-30 | 1 | -2/+4 |
* | | | | | | | | | Merge pull request #4232 from richm/mux-namespaces-docs | OpenShift Bot | 2017-06-02 | 5 | -15/+60 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | add mux docs; allow to specify mux namespaces | Rich Megginson | 2017-05-31 | 5 | -15/+60 |
* | | | | | | | | | | Merge pull request #4322 from ashcrow/1455843 | OpenShift Bot | 2017-06-01 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | upgrade: Reload systemd before restart | Steve Milner | 2017-05-31 | 1 | -0/+8 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4333 from jarrpa/oc_secret-type | OpenShift Bot | 2017-06-01 | 8 | -5/+46 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | oc_secret: allow for specifying secret type | Jose A. Rivera | 2017-05-31 | 8 | -5/+46 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #4015 from rparulek/copy-nuage-vsd-certs | OpenShift Bot | 2017-06-01 | 6 | -10/+32 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Copy Nuage VSD generated user certificates to Openshift master nodes | Sneha Deshpande | 2017-05-22 | 6 | -10/+32 |
* | | | | | | | | | | fix curator host, port params; remove curator es volumes | Rich Megginson | 2017-05-31 | 2 | -5/+4 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #4332 from stevekuznetsov/skuznets/escalation-fixes | Scott Dodson | 2017-05-31 | 2 | -2/+0 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Revert "Merge pull request #4271 from DG-i/master" | Steve Kuznetsov | 2017-05-31 | 2 | -2/+0 |
| | |/ / / / / / | |/| | | | | | | |||||
* / | | | | | | | AMP 2.0 | Scott Dodson | 2017-05-31 | 12 | -160/+1639 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3941 from pgier/JMAN4-161 | Scott Dodson | 2017-05-31 | 4 | -0/+624 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | [JMAN4-161] Add templates and pv example for cloudforms jboss middleware manager | Paul Gier | 2017-04-26 | 4 | -0/+624 |
* | | | | | | | Merge pull request #4091 from richm/oc_service-labels-externalIPs | Scott Dodson | 2017-05-31 | 40 | -248/+931 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add support for oc_service for labels, externalIPs | Rich Megginson | 2017-05-30 | 40 | -248/+931 |
* | | | | | | | | Merge pull request #4225 from ingvagabund/relax-rpm-image-version-check | Jan Chaloupka | 2017-05-31 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | check for rpm version and docker image version equality only if openshift_pkg... | Jan Chaloupka | 2017-05-18 | 1 | -2/+7 |
* | | | | | | | | | Merge pull request #4272 from ashcrow/system-package-no-hardcode | OpenShift Bot | 2017-05-30 | 3 | -8/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove typos that got reintroduced | Steve Milner | 2017-05-25 | 1 | -2/+2 |
| * | | | | | | | | | oc_atomic_container: Workaround for invalid json from atomic command | Steve Milner | 2017-05-25 | 2 | -2/+6 |
| * | | | | | | | | | Remove system-package=no from container-engine install | Steve Milner | 2017-05-25 | 1 | -2/+0 |
| * | | | | | | | | | oc_atomic_container: Hard code system-package=no | Steve Milner | 2017-05-25 | 2 | -2/+6 |
* | | | | | | | | | | Merge pull request #4299 from sdodson/bool | OpenShift Bot | 2017-05-30 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | bool | Scott Dodson | 2017-05-26 | 1 | -2/+2 |