Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2702 from jkhelil/fix_master_config_template | Andrew Butcher | 2016-11-16 | 2 | -16/+18 |
|\ | |||||
| * | Prevent useless master by reworking template for master service enf file | Jawed khelil | 2016-11-02 | 2 | -16/+18 |
* | | Merge pull request #2606 from abutcher/nuage-haproxy-port | Tim Bielawa | 2016-11-16 | 1 | -0/+5 |
|\ \ | |||||
| * | | Add nuage rest server port to haproxy firewall rules. | Andrew Butcher | 2016-10-14 | 1 | -0/+5 |
* | | | Merge pull request #2636 from enlinxu/master | Andrew Butcher | 2016-11-16 | 3 | -0/+7 |
|\ \ \ | |||||
| * | | | support 3rd party scheduler | enlinxu | 2016-10-20 | 3 | -0/+7 |
* | | | | Merge pull request #2803 from tbielawa/BZ1390849 | Scott Dodson | 2016-11-16 | 2 | -5/+28 |
|\ \ \ \ | |||||
| * | | | | Add view permissions to hawkular sa | Scott Dodson | 2016-11-15 | 1 | -0/+18 |
| * | | | | Use multiple '-v's when creating the metrics deployer command | Tim Bielawa | 2016-11-15 | 2 | -5/+10 |
* | | | | | Merge pull request #2763 from yfauser/byo_cni_plugin_fixes | Andrew Butcher | 2016-11-16 | 3 | -2/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Change to allow cni deployments without openshift SDN | yfauser | 2016-11-08 | 3 | -2/+4 |
* | | | | | | Merge pull request #2810 from sdodson/BZ1390913 | Scott Dodson | 2016-11-15 | 1 | -5/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix typo | Scott Dodson | 2016-11-15 | 1 | -1/+1 |
| * | | | | | | Fix a few places where we're not specifying the admin kubeconfig | Scott Dodson | 2016-11-15 | 1 | -6/+12 |
| * | | | | | | Add rolebinding-reader | Scott Dodson | 2016-11-15 | 1 | -0/+7 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #2677 from EricMountain-1A/fix_docker_fatal_selinux_4upstr... | Scott Dodson | 2016-11-14 | 1 | -11/+11 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Docker daemon is started prematurely. | Eric Mountain | 2016-11-14 | 1 | -11/+11 |
* | | | | | | Sync logging deployer changes from origin to enterprise | Scott Dodson | 2016-11-14 | 1 | -0/+20 |
* | | | | | | Sync latest enterprise/metrics-deployer.yaml | Scott Dodson | 2016-11-14 | 2 | -0/+12 |
* | | | | | | Sync latest s2i content | Scott Dodson | 2016-11-14 | 1 | -3/+8 |
|/ / / / / | |||||
* | | | | | Merge pull request #2562 from sdodson/etcd3 | Scott Dodson | 2016-11-14 | 5 | -3/+39 |
|\ \ \ \ \ | |||||
| * | | | | | Add updates for containerized | Scott Dodson | 2016-11-14 | 2 | -3/+14 |
| * | | | | | Drop /etc/profile.d/etcdctl.sh | Scott Dodson | 2016-11-14 | 3 | -0/+25 |
* | | | | | | Merge pull request #2798 from tbielawa/BZ1389137 | Tim Bielawa | 2016-11-14 | 1 | -0/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix commit-offsets in version detection for containerized installs | Tim Bielawa | 2016-11-14 | 1 | -0/+5 |
| |/ / / / / | |||||
* / / / / / | Added dependency of os_firewall to docker role | Russell Teague | 2016-11-14 | 5 | -6/+6 |
|/ / / / / | |||||
* | | | | | Merge pull request #2770 from mtnbikenc/docker-fix | Russell Teague | 2016-11-11 | 3 | -1/+19 |
|\ \ \ \ \ | |||||
| * | | | | | Resolve docker and iptables service dependencies | Russell Teague | 2016-11-11 | 3 | -1/+19 |
* | | | | | | Merge pull request #2600 from mscherer/python3_porting | Scott Dodson | 2016-11-10 | 1 | -8/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Port openshift_facts to py3 | Michael Scherer | 2016-10-14 | 1 | -8/+17 |
* | | | | | | | Merge pull request #2777 from dgoodwin/jenkins-role-bindings | Scott Dodson | 2016-11-10 | 1 | -2/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Reconcile role bindings for jenkins pipeline during upgrade. | Devan Goodwin | 2016-11-10 | 1 | -2/+8 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #2766 from andrewklau/master | Scott Dodson | 2016-11-09 | 2 | -19/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Re-sync v1.4 image streams | Andrew Lau | 2016-11-09 | 2 | -19/+19 |
| |/ / / / / / | |||||
* / / / / / / | Fix typos in openshift_facts gce cloud provider | Scott Dodson | 2016-11-09 | 1 | -2/+2 |
|/ / / / / / | |||||
* | / / / / | Revert "Revert openshift.node.nodename changes" | Scott Dodson | 2016-11-08 | 3 | -13/+26 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #2753 from jkhelil/proxy_settings | Scott Dodson | 2016-11-08 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Always add local dns domain to no_proxy | jawed | 2016-11-08 | 1 | -2/+2 |
* | | | | | | Merge pull request #2751 from sdodson/BZ1388253 | Scott Dodson | 2016-11-08 | 3 | -26/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "Fix the nodeName of the OpenShift nodes on OpenStack" | Scott Dodson | 2016-11-07 | 1 | -1/+1 |
| * | | | | | | Revert "Fix OpenStack cloud provider" | Scott Dodson | 2016-11-07 | 3 | -16/+6 |
| * | | | | | | Revert "Check that OpenStack hostnames are resolvable" | Scott Dodson | 2016-11-07 | 1 | -9/+6 |
* | | | | | | | Merge pull request #2754 from jprovaznik/flannel_prefix | Scott Dodson | 2016-11-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | FIx flannel var name | Jan Provaznik | 2016-11-08 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #2759 from sdodson/flannel-containerized | Scott Dodson | 2016-11-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Install flannel RPM on containerized but not atomic | Scott Dodson | 2016-11-08 | 1 | -1/+1 |
| |/ / / / / / | |||||
* / / / / / / | Refactor default sdn_cluster_network_cidr and sdn_host_subnet_length | Scott Dodson | 2016-11-07 | 1 | -4/+9 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #2652 from smunilla/BZ1320952_default_for_clusterNetworkCIDR | Scott Dodson | 2016-11-07 | 1 | -5/+19 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Update defaults for clusterNetworkCIDR & hostSubnetLength | Samuel Munilla | 2016-11-03 | 1 | -5/+19 |
* | | | | | | set AWS creds task with no_logs | Sally O'Malley | 2016-11-07 | 1 | -0/+1 |