summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into contrib_pre-commit_hookTim Bielawa2017-04-2818-196/+346
|\
| * Merge pull request #3983 from rhcarvalho/docs-and-ciScott Dodson2017-04-285-123/+236
| |\ | | | | | | Document pull request process and improve contribution guide
| | * Document the Pull Request processRodolfo Carvalho2017-04-272-0/+88
| | |
| | * Add Table of ContentsRodolfo Carvalho2017-04-271-0/+16
| | |
| | * Improve Contribution GuideRodolfo Carvalho2017-04-271-56/+82
| | | | | | | | | | | | | | | Update how to submit contributions and how to run tests, reorganizing and expanding the content.
| | * Replace absolute with relative URLsRodolfo Carvalho2017-04-271-3/+3
| | | | | | | | | | | | | | | This makes the links point to the right place in different contexts (e.g., different branches).
| | * Move repo structure to a separate documentRodolfo Carvalho2017-04-272-55/+55
| | | | | | | | | | | | Reduces the clutter in CONTRIBUTING.md.
| | * Remove outdated information about PRsRodolfo Carvalho2017-04-271-16/+0
| | | | | | | | | | | | | | | | | | | | | The contents are outdated and irrelevant since the "best practice" is automatically enforced. Documenting the PR flow is out of the Best Practices guide.
| | * Move link to BUILD.md to README.mdRodolfo Carvalho2017-04-272-5/+4
| | | | | | | | | | | | | | | | | | | | | Most people contributing to the project do not need to build an RPM, so it can be left out of the Contribution Guide. Placing it in the README for still some visibility.
| * | Automatic commit of package [openshift-ansible] release [3.6.42-1].Jenkins CD Merge Bot2017-04-282-2/+6
| | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
| * | Merge pull request #3994 from codificat/boto-requirementOpenShift Bot2017-04-282-1/+3
| |\ \ | | | | | | | | Merged by openshift-bot
| | * | Add python-boto requirementPep Turró Mauri2017-04-252-1/+3
| | | | | | | | | | | | | | | | The AWS inventory (inventory/aws/hosts/ec2.py) uses the Boto library.
| * | | Merge pull request #4009 from codificat/ex-job-fixOpenShift Bot2017-04-273-68/+80
| |\ \ \ | | | | | | | | | | Merged by openshift-bot
| | * | | Fix certificate check Job examplesPep Turró Mauri2017-04-263-68/+80
| | | | | | | | | | | | | | | | | | | | | | | | | The example Job specifications were wrong (they had a Pod spec instead). Also fixing a tabs-vs-spaces problem in examples/README.md.
| * | | | Automatic commit of package [openshift-ansible] release [3.6.41-1].Jenkins CD Merge Bot2017-04-272-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
| * | | | Merge pull request #4017 from mtnbikenc/fix-swapOpenShift Bot2017-04-272-2/+2
| |\ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| | * | | | Add bool for proper conditional handlingRussell Teague2017-04-262-2/+2
| | | |_|/ | | |/| |
| * | | | Automatic commit of package [openshift-ansible] release [3.6.40-1].Jenkins CD Merge Bot2017-04-272-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
| * | | | Merge pull request #3951 from lhuard1A/fix_bin_cluster_no_glusterfsOpenShift Bot2017-04-274-0/+8
| |\ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| | * | | | Fix cluster creation with `bin/cluster` when there’s no glusterfs nodeLénaïc Huard2017-04-195-3/+11
| | | | | |
| * | | | | Automatic commit of package [openshift-ansible] release [3.6.39-1].Jenkins CD Merge Bot2017-04-272-2/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* / | | | Contrib: Hook to verify modules match assembled fragmentsTim Bielawa2017-04-284-0/+118
|/ / / /
* | | | Merge pull request #3961 from codificat/qe-container-docOpenShift Bot2017-04-263-28/+52
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Move container build instructions to BUILD.mdPep Turró Mauri2017-04-243-21/+26
| | | | |
| * | | | Elaborate container image usage instructionsPep Turró Mauri2017-04-241-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Explain that the base image expects to run as non-root and the implications of this, and expand the example 'docker run' options in detail.
* | | | | Automatic commit of package [openshift-ansible] release [3.6.38-1].Jenkins CD Merge Bot2017-04-262-2/+25
| |_|/ / |/| | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | Merge pull request #4005 from jlebon/pr/rhci-journalsOpenShift Bot2017-04-262-20/+34
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | .redhat-ci.yml: also publish journal logsJonathan Lebon2017-04-252-20/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update to only target v3.6.0-alpha.1 (will open another PR to target the newly released 1.5.0 on the 1.5 branch). - Move test script to its own file. - Upload journal logs on failure.
* | | | | Merge pull request #3816 from sosiouxme/20170328-integration-testsOpenShift Bot2017-04-2630-1/+948
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | integration tests: add CI scriptsLuke Meyer2017-04-259-33/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some scripts that can be run from Jenkins to build/push test images and to run the tests. Updated README to expand on running tests.
| * | | | | preflight int tests: define image builds to support testsLuke Meyer2017-04-2510-0/+219
| | | | | |
| * | | | | preflight int tests: generalize; add testsLuke Meyer2017-04-2520-98/+406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the container setup and teardown more reusable. Remove example tests. Add basic package tests.
| * | | | | Add stub of preflight integration testsRodolfo Carvalho2017-04-2510-0/+232
| | | | | |
| * | | | | Move Python unit tests to subdirectoryRodolfo Carvalho2017-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | To make room for integration tests.
* | | | | | Merge pull request #3950 from lhuard1A/enterprise_ose_3.5OpenShift Bot2017-04-261-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Make the rhel_subscribe role subscribe to OSE 3.5 channel by defaultLénaïc Huard2017-04-191-3/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #3860 from sdodson/backup-v3-dataOpenShift Bot2017-04-251-32/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Cleanup comments and remove extraneous tasksScott Dodson2017-04-101-23/+7
| | | | | | |
| * | | | | | Store backups in /var/lib/etcd/openshift-backupScott Dodson2017-04-101-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because containerized installs don't mount /var/lib/origin and we switched to running the backup inside the container that meant that we were backing up the etcd data into a directory inside the container filesystem. Since we have no other volume mounted we need to backup into /var/lib/etcd.
| * | | | | | Create member/snap directory encase it doesn't existScott Dodson2017-04-071-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes TASK [Copy etcd v3 data store] ************************************************* fatal: [host.redhat.com]: FAILED! => { "changed": true, "cmd": [ "cp", "-a", "/var/lib/etcd//member/snap", "/var/lib/origin/etcd-backup-pre-upgrade-20170407055413/member/" ], "delta": "0:00:00.003152", "end": "2017-04-07 01:54:17.584685", "failed": true, "rc": 1, "start": "2017-04-07 01:54:17.581533", "warnings": [] } STDERR: cp: cannot create directory ?/var/lib/origin/etcd-backup-pre-upgrade-20170407055413/member/?: No such file or directory
| * | | | | | Copy v3 data dir when performing backupScott Dodson2017-04-051-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1433272
* | | | | | | Merge pull request #3970 from mtnbikenc/3_6-upgradeOpenShift Bot2017-04-25138-18/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Standardize all Origin versioning on 3.6Russell Teague2017-04-25138-18/+27
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #3988 from abutcher/router-cert-varsOpenShift Bot2017-04-252-10/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Replace original router cert variable names.Andrew Butcher2017-04-242-10/+10
| | | | | | | |
* | | | | | | | Merge pull request #3968 from jarrpa/oc_obj-kindsOpenShift Bot2017-04-253-14/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Merged by openshift-bot
| * | | | | | | oc_obj: Allow for multiple kinds in deleteJose A. Rivera2017-04-213-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | | | Merge pull request #3962 from sdodson/image-stream-syncOpenShift Bot2017-04-256-8/+50
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | Update v1.5 contentScott Dodson2017-04-203-4/+25
| | | | | | | | |
| * | | | | | | | Update v1.6 contentScott Dodson2017-04-203-4/+25
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 19:14:05 +0000