Add go1.4 to travis
Merge pull request #549 from liggitt/go_14

Merged by openshift-bot
add instructions to edit registry service ip
Merge pull request #556 from bparees/sample_services

Merged by openshift-bot
Improve error reporting

Follow-up of upstream changes:
- cherry-pick(github.com/GoogleCloudPlatform/kubernetes):72c922668fefc1cf671d9c9e38ebf22a22a80dcf
- cherry-pick(github.com/GoogleCloudPlatform/kubernetes):397240aebe029b6ff5c64fa4f04f5524b053f115
Initial addition of CustomBuild type
cancel-build fails if no pod was assigned
Added documentation for custom build
Merge pull request #555 from deads2k/deads-track-down-flaky-travis

Merged by openshift-bot
add cli challenge interaction, kick travis again
fix auth packages, kick travis yet again
Fix project description in example and console to work as an annotation
Refactoring router.go to handle errors. Improving code coverage
- Add port forwarding from 8080 to localhost:8080 on VirtualBox
- Refactoring router.go to handle errors. Improving code coverage.
- Adding port forwarding from 80 to localhost:1080 on VirtualBox, and comments on how to test locally
- Applying refactor change to controller/test/test_router.go
- Fixing identation
- Fixing unit tests
- Organizing imports
- Merge
Rename STIBuildStrategy.BuildImage to Image
Merge pull request #541 from mfojtik/custom_build

Merged by openshift-bot
helper script to fix registry ip
Merge pull request #564 from bparees/sample_helper

Merged by openshift-bot
Move from go 1.4rc2 to 1.4 release
Merge pull request #566 from liggitt/patch-1

Merged by openshift-bot
bump(github.com/GoogleCloudPlatform/kubernetes):3910b2d6e18759b3a9a6920c7f3d0ccd122df7f9