Skip to content

Rebase Kubernetes onto 0.12 #1373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-bot merged 30 commits into from
Mar 20, 2015
Merged

Rebase Kubernetes onto 0.12 #1373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
657bc6a
Unset KUBECONFIG prior to hack/test-cmd.sh
smarterclayton Mar 19, 2015
1b0a1ae
bump(github.com/GoogleCloudPlatform/kubernetes):c5f73516b677434d9cce7…
smarterclayton Mar 18, 2015
34d8c2f
UPSTREAM: Remove cadvisor_mock.go
smarterclayton Mar 19, 2015
bdc0360
UPSTREAM: Handle missing resolv.conf
smarterclayton Mar 10, 2015
af6aea8
UPSTREAM: Disable systemd activation for DNS
smarterclayton Mar 9, 2015
00a51c0
UPSTREAM: Disable UIs for Kubernetes and etcd
smarterclayton Dec 24, 2014
0597fdd
UPSTREAM: need to make sure --help flags is registered before calling…
fabianofranz Feb 3, 2015
7acc288
UPSTREAM: Make setSelfLink not bail out
smarterclayton Feb 25, 2015
89d1bc2
UPSTREAM: Lazily init systemd for code that includes cadvisor but doe…
smarterclayton Mar 19, 2015
abfaa3f
UPSTREAM: Remove global map from healthz
smarterclayton Mar 19, 2015
0321b4d
Refactor 1
smarterclayton Mar 19, 2015
53e14a1
Refactor 2
smarterclayton Mar 19, 2015
b1e26d8
Refactor 3
smarterclayton Mar 19, 2015
0e2896f
Refactor 4
smarterclayton Mar 19, 2015
b02e84c
Refactor 5
smarterclayton Mar 19, 2015
a64b92c
Refactor 6
smarterclayton Mar 19, 2015
36caa92
Refactor 7
smarterclayton Mar 19, 2015
e1cb421
Refactor 8
smarterclayton Mar 19, 2015
44057ac
Refactor 9
smarterclayton Mar 20, 2015
8d9d4f1
Refactor 10
smarterclayton Mar 20, 2015
965949f
Remove debug logging from image controller
smarterclayton Mar 19, 2015
432096e
Add check-test in between check and test
smarterclayton Mar 19, 2015
fd4be6a
Ensure integration tests run when Docker is not available
smarterclayton Mar 19, 2015
2130a7c
Kubelet health check fails when not sent to hostname
smarterclayton Mar 19, 2015
4ff84c9
Refactor 11
smarterclayton Mar 20, 2015
d6a708b
Convert travis to make check-test
smarterclayton Mar 20, 2015
47e4f92
Add info messages for end-to-end
smarterclayton Mar 20, 2015
940fc30
Fixed buildlogs
soltysh Mar 20, 2015
43d5609
Refactor 12
smarterclayton Mar 20, 2015
c70d3bc
Use semantic deep equal for comparison
smarterclayton Mar 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 1 addition & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ matrix:
env: TEST_ASSETS=true

install:
- ./hack/verify-gofmt.sh
- ./hack/verify-jsonformat.sh
- ./hack/install-etcd.sh
- ./hack/install-std-race.sh
Expand All @@ -23,9 +22,7 @@ install:
- ./hack/install-assets.sh

script:
- KUBE_RACE="-race" KUBE_COVER="-cover -covermode=atomic" ./hack/test-go.sh "" -p=4
- ./hack/test-cmd.sh
- PATH=$HOME/gopath/bin:./_output/etcd/bin:$PATH ./hack/test-integration.sh
- PATH=$HOME/gopath/bin:./_output/etcd/bin:$PATH make check-test GOFLAGS="-p=4"
- ./hack/test-assets.sh

notifications:
Expand Down
Loading