Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openshift/origin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.5.0-alpha.3
Choose a base ref
...
head repository: openshift/origin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.5.0-rc.0
Choose a head ref
29 contributors

Commits on Feb 14, 2017

  1. Add missing newlines in oc tag

    @soltysh
    soltysh committed Feb 14, 2017
    Copy the full SHA
    f52c0a1 View commit details

Commits on Feb 15, 2017

  1. Change "." to "-" in generated hostnames for routes 

    if a route is named example.test the default generated hostname is

example.test-default.router.default.svc.cluster.local

This changes the default generated hostname to

example-test-default.router.default.svc.cluster.local

Bug 1414956
    @JacobTanenbaum
    JacobTanenbaum committed Feb 15, 2017
    Copy the full SHA
    23ce2ca View commit details

Commits on Feb 16, 2017

  1. UPSTREAM: 41196: Fix for Premature iSCSI logout 

    Signed-off-by: Huamin Chen <hchen@redhat.com>
    @rootfs
    rootfs committed Feb 16, 2017
    Copy the full SHA
    b5ae00c View commit details

Commits on Feb 17, 2017

  1. Ensure RPMs are only build from clean git trees 

    The `tito` process for building RPMs will not incorporate any changes
that are not committed in the git tree, so if we notice that the git
three state is dirty during the RPM build, we should fail early and
ask the user to commit their changes first before re-trying the build.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
    @stevekuznetsov
    stevekuznetsov committed Feb 17, 2017
    Copy the full SHA
    cec748f View commit details

Commits on Feb 20, 2017

  1. Fix force pull behavior in release, correct changelog gen

    @smarterclayton
    smarterclayton committed Feb 20, 2017
    Copy the full SHA
    591b34d View commit details

  2. Origin image was creating a file at /usr/local/bin with imagebuilder 

    Made more specific, filed a bug in imagebuilder.
    @smarterclayton
    smarterclayton committed Feb 20, 2017
    Copy the full SHA
    f6edd3d View commit details

  3. Pullthrough typos in oc tag

    @soltysh
    soltysh committed Feb 20, 2017
    Copy the full SHA
    71f40da View commit details

  4. Merge pull request #13000 from stevekuznetsov/skuznets/ensure-clean-tree 

    Merged by openshift-bot
    OpenShift Bot authored Feb 20, 2017
    Copy the full SHA
    e376a9a View commit details

  5. Backported redistributable logic to Origin specfile 

    This back-ports downstream commit 25fa795.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
    @stevekuznetsov
    stevekuznetsov committed Feb 20, 2017
    Copy the full SHA
    ab709c2 View commit details

  6. patch kubeconfig if token cannot be deleted via api 

    remove token from config on error / success from api req

log server error to prevent failure on sa logout
    @juanvallejo
    juanvallejo committed Feb 20, 2017
    Copy the full SHA
    bf1f4e2 View commit details

  7. Merge pull request #12948 from soltysh/tag_newlines 

    Merged by openshift-bot
    OpenShift Bot authored Feb 20, 2017
    Copy the full SHA
    41c7fe9 View commit details

  8. bump(github.com/openshift/origin-web-console): 8a5a5f12c3d614d1e8a97e… 

    …87829c2ca2504939b3
    OpenShift Bot committed Feb 20, 2017
    Copy the full SHA
    3f36d2e View commit details

  9. Removed line breaks in glog messages

    @fabianofranz
    fabianofranz authored Feb 20, 2017
    Copy the full SHA
    3c0eb53 View commit details

  10. only report no running pods once

    pweil- committed Feb 20, 2017
    Copy the full SHA
    b0b9bbc View commit details

  11. Merge pull request #12976 from JacobTanenbaum/BZ1414956 

    Merged by openshift-bot
    OpenShift Bot authored Feb 20, 2017
    Copy the full SHA
    ffdaf6d View commit details

  12. Merge pull request #12990 from rootfs/iscsi-pr-master 

    Merged by openshift-bot
    OpenShift Bot authored Feb 20, 2017
    Copy the full SHA
    c9fd22b View commit details

  13. Generated changes

    @soltysh
    soltysh committed Feb 20, 2017
    Copy the full SHA
    8dd4472 View commit details

  14. Merge pull request #13009 from smarterclayton/release_fixes 

    Merged by openshift-bot
    OpenShift Bot authored Feb 20, 2017
    Copy the full SHA
    3ef5377 View commit details

Commits on Feb 21, 2017

  1. Merge pull request #13015 from soltysh/tag_typo 

    Merged by openshift-bot
    OpenShift Bot authored Feb 21, 2017
    Copy the full SHA
    796a323 View commit details

  2. Merge pull request #12969 from stevekuznetsov/skuznets/specfile-updates 

    Merged by openshift-bot
    OpenShift Bot authored Feb 21, 2017
    Copy the full SHA
    275db41 View commit details

  3. Merge pull request #12962 from juanvallejo/jvallejo/delete-sa-token-k… 

    …ubeconfig-logout

Merged by openshift-bot
    OpenShift Bot authored Feb 21, 2017
    Copy the full SHA
    a16f4c6 View commit details

  4. Merge pull request #13022 from pweil-/bz-1301464 

    Merged by openshift-bot
    OpenShift Bot authored Feb 21, 2017
    Copy the full SHA
    03e7153 View commit details

Commits on Feb 22, 2017

  1. PSP reviews: client

    @sdminonne @soltysh
    sdminonne authored and soltysh committed Feb 22, 2017
    Copy the full SHA
    c436567 View commit details

  2. fix bugzilla 1421616 and 1421570

    @sdminonne @soltysh
    sdminonne authored and soltysh committed Feb 22, 2017
    Copy the full SHA
    9158e96 View commit details

  3. SCC review client: fix bugzilla 1424946

    @sdminonne @soltysh
    sdminonne authored and soltysh committed Feb 22, 2017
    Copy the full SHA
    848f6b2 View commit details

  4. SCC review client: generated code

    @sdminonne @soltysh
    sdminonne authored and soltysh committed Feb 22, 2017
    Copy the full SHA
    69a0cc6 View commit details

  5. to fix bugzilla 1424946

    @soltysh
    soltysh committed Feb 22, 2017
    Copy the full SHA
    74019ec View commit details

  6. UPSTREAM: 38746: recognize eu-west-2 region

    pweil- committed Feb 22, 2017
    Copy the full SHA
    50b4993 View commit details

  7. UPSTREAM: 38909: Add path exist check in getPodVolumePathListFromDisk

    pweil- committed Feb 22, 2017
    Copy the full SHA
    41c14af View commit details

  8. install ceph-common pkg on origin to support rbd provisioning 

    Signed-off-by: Huamin Chen <hchen@redhat.com>
    @rootfs
    rootfs committed Feb 22, 2017
    Copy the full SHA
    dca0420 View commit details

Commits on Feb 23, 2017

  1. Bug 1425706 - protect from nil tlsConfig. 

    In very special case (client config does not contain ca cert nor auth cert nor
set tls-insecure), tlsConfig can be nil and no error is returned from TLSConfigFor
either, thus we need to check for nil on tlsConfig before proceeding in
image pruning.
    @soltysh
    soltysh committed Feb 23, 2017
    Copy the full SHA
    32f4837 View commit details

  2. prevent build updates from reverting the build phase

    @bparees
    bparees committed Feb 23, 2017
    Copy the full SHA
    2a347ee View commit details

  3. Merge pull request #13060 from rootfs/rbd-img-15 

    Merged by openshift-bot
    OpenShift Bot authored Feb 23, 2017
    Copy the full SHA
    cf5b77f View commit details

  4. Merge pull request #13045 from soltysh/cherry-pick-12478 

    Merged by openshift-bot
    OpenShift Bot authored Feb 23, 2017
    Copy the full SHA
    4a74666 View commit details

  5. Stop checking in generated docs

    @0xmichalis
    0xmichalis committed Feb 23, 2017
    Copy the full SHA
    f5d535b View commit details

  6. Check out generated docs

    @0xmichalis
    0xmichalis committed Feb 23, 2017
    Copy the full SHA
    4466ada View commit details

  7. Remove redundant docs

    @0xmichalis
    0xmichalis committed Feb 23, 2017
    Copy the full SHA
    c835705 View commit details

  8. tito: generate man pages

    @0xmichalis
    0xmichalis committed Feb 23, 2017
    Copy the full SHA
    26d47cf View commit details

  9. UPSTREAM: 38855: Fix variable shadowing in exponential backoff when d… 

    …eleting volumes
    pweil- committed Feb 23, 2017
    Copy the full SHA
    e479bd9 View commit details

  10. UPSTREAM: 40935: Plumb subresource through subjectaccessreview

    pweil- committed Feb 23, 2017
    Copy the full SHA
    66cb516 View commit details

  11. UPSTREAM: 40497: Make HandleError prevent hot-loops

    pweil- committed Feb 23, 2017
    Copy the full SHA
    07440e7 View commit details

  12. UPSTREAM: 40553: Adjust global log limit to 1ms

    pweil- committed Feb 23, 2017
    Copy the full SHA
    97b32f5 View commit details

  13. Don't overwrite /usr/local/bin with a file

    @sdodson
    sdodson committed Feb 23, 2017
    Copy the full SHA
    79db8a1 View commit details

  14. Bug 1422376: Fix resolving ImageStreamImage latest tag

    @mfojtik
    mfojtik committed Feb 23, 2017
    Copy the full SHA
    232330d View commit details

  15. Merge pull request #13073 from soltysh/bug1425706_1.5 

    Merged by openshift-bot
    OpenShift Bot authored Feb 23, 2017
    Copy the full SHA
    2e2a6d6 View commit details

  16. Merge pull request #13075 from bparees/backport_phase 

    Merged by openshift-bot
    OpenShift Bot authored Feb 23, 2017
    Copy the full SHA
    76b2a8f View commit details

Commits on Feb 24, 2017

  1. Merge pull request #13090 from mfojtik/fix_latest_image_tagevent_35 

    Merged by openshift-bot
    OpenShift Bot authored Feb 24, 2017
    Copy the full SHA
    42bdc43 View commit details

  2. Verify manifest with remote layers 

    Signed-off-by: Gladkov Alexey <agladkov@redhat.com>
    @legionus
    legionus committed Feb 24, 2017
    Copy the full SHA
    37f8635 View commit details

  3. update guest profile with new arp tuning missed in #13034

    @jeremyeder
    jeremyeder committed Feb 24, 2017
    Copy the full SHA
    c17d55b View commit details

  4. Merge pull request #13078 from kargakis/stop-generation-for-15 

    Merged by openshift-bot
    OpenShift Bot authored Feb 24, 2017
    Copy the full SHA
    4cc8555 View commit details
Loading