summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #2453 from zeari/manageiq_allow_create_projectAndrew Butcher2016-09-161-0/+1
|\ \ \ \ \ \
| * | | | | | Add role to manageiq to allow creation of projectsAri Zellner2016-09-151-0/+1
* | | | | | | Update README.mdScott Dodson2016-09-161-1/+1
* | | | | | | Merge pull request #2447 from sdodson/branchesScott Dodson2016-09-161-7/+11
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Switch to origin-1.x branch namesScott Dodson2016-09-161-7/+11
* | | | | | | Merge pull request #2420 from smunilla/BZ1336271Scott Dodson2016-09-161-2/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | a-o-i: Do not display version number in quick installerSamuel Munilla2016-09-081-2/+1
* | | | | | | Merge pull request #2456 from vishpat/nuage_portsScott Dodson2016-09-162-2/+10
|\ \ \ \ \ \ \
| * | | | | | | Open ports for vxlan and Nuage monitorVishal Patil2016-09-162-2/+10
* | | | | | | | Merge pull request #2451 from smunilla/BZ1375946Scott Dodson2016-09-151-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | a-o-i: Don't set unschedulable nodes as infraSamuel Munilla2016-09-141-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2437 from abutcher/delegated-serial-commandScott Dodson2016-09-153-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Move delegated_serial_command module to etcd_common.Andrew Butcher2016-09-123-2/+0
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2452 from abutcher/max-ebs-volume-countScott Dodson2016-09-151-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add 'MaxEBSVolumeCount' to default scheduler predicates.Andrew Butcher2016-09-141-0/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #2295 from dgoodwin/override-docker-upgradeScott Dodson2016-09-151-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Allow overriding the Docker 1.10 requirement for upgrade.Devan Goodwin2016-08-151-1/+1
* | | | | | | | Merge pull request #2449 from abutcher/service-signer-upgradeScott Dodson2016-09-143-1/+102
|\ \ \ \ \ \ \ \
| * | | | | | | | [upgrade] Create/configure service signer cert when missing.Andrew Butcher2016-09-143-1/+102
* | | | | | | | | Merge pull request #2442 from bparees/quickstartsScott Dodson2016-09-146-1280/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | get quickstarts from origin, not upstream example reposBen Parees2016-09-146-1280/+22
| |/ / / / / / / /
* | | | | | | | | Merge pull request #2450 from abutcher/issue2448Scott Dodson2016-09-141-1/+11
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | [redeploy-certificates] Set default value for openshift_master_default_subdom...Andrew Butcher2016-09-141-0/+8
| * | | | | | | | [redeploy-certificates] Correct etcd service name.Andrew Butcher2016-09-141-1/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #2443 from sdodson/bz1375031Andrew Butcher2016-09-131-0/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Define proxy settings for node servicesScott Dodson2016-09-131-0/+17
|/ / / / / / /
* | | | | | | Merge pull request #2439 from abutcher/restart-openvswitchScott Dodson2016-09-121-2/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Check for use_openshift_sdn when restarting openvswitch.Andrew Butcher2016-09-121-2/+1
|/ / / / / /
* | | | | | Merge pull request #2440 from abutcher/readme-linksScott Dodson2016-09-121-13/+13
|\ \ \ \ \ \
| * | | | | | Fix README links.Andrew Butcher2016-09-121-13/+13
* | | | | | | Merge pull request #2438 from abutcher/flannel-uninstallScott Dodson2016-09-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Check for is_atomic when uninstalling flannel package.Andrew Butcher2016-09-121-1/+1
* | | | | | | | Merge pull request #2429 from dgoodwin/openvswitch-restart-pauseScott Dodson2016-09-121-0/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Pause after restarting openvswitch in containerized upgrade.Devan Goodwin2016-09-121-0/+6
* | | | | | | | Merge pull request #2431 from elyscape/2430-always-dedupe-cert-namesAndrew Butcher2016-09-121-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Always deduplicate detected certificate namesEli Young2016-09-091-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #2432 from andrewklau/masterScott Dodson2016-09-123-0/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add acceptschema2 and enforcequota settings for hosted registryAndrew Lau2016-09-103-0/+6
|/ / / / / /
* | | | | | Merge pull request #2428 from abutcher/s3-rootdirectoryScott Dodson2016-09-093-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add option for specifying s3 registry storage root directory.Andrew Butcher2016-09-093-1/+3
* | | | | | Merge pull request #2425 from dgoodwin/flush-handlersScott Dodson2016-09-091-0/+2
|\ \ \ \ \ \
| * | | | | | Flush handlers before marking a node schedulable after upgrade.Devan Goodwin2016-09-091-0/+2
| |/ / / / /
* | | | | | Merge pull request #2427 from abutcher/BZ1298336Scott Dodson2016-09-091-0/+4
|\ \ \ \ \ \
| * | | | | | Set config/namespace where missing for secure registry deployment.Andrew Butcher2016-09-091-0/+4
| |/ / / / /
* | | | | | Merge pull request #2422 from abutcher/manage-node-hostnamesAndrew Butcher2016-09-092-8/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Iterate over node inventory hostnames instead of openshift.common.hostname wi...Andrew Butcher2016-09-082-8/+4
| |/ / / /
* | | | | Merge pull request #2418 from sdodson/branchesScott Dodson2016-09-081-0/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Explain our branching strategyScott Dodson2016-09-071-0/+9
* | | | | Merge pull request #2398 from mkumatag/fix_warningsScott Dodson2016-09-083-6/+17
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix warningsManjunath A Kumatagi2016-09-073-6/+17