Skip to content
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.

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

Use kutil in e2e-test #201

Merged
merged 15 commits into from
Sep 14, 2017
Merged

Use kutil in e2e-test #201

merged 15 commits into from
Sep 14, 2017

Conversation

mirshahriar
Copy link
Contributor

No description provided.

@mirshahriar mirshahriar requested a review from tamalsaha August 22, 2017 11:32
shahriar added 3 commits August 23, 2017 10:48
# Conflicts:
#	glide.lock
#	glide.yaml
#	vendor/github.com/Knetic/govaluate/EvaluableExpression.go
#	vendor/github.com/Knetic/govaluate/evaluationStage.go
#	vendor/github.com/Knetic/govaluate/parsing.go
@tamalsaha
Copy link
Contributor

@aerokite, can you rebase ? Also use kutil's release-4.0 branch

shahriar and others added 3 commits September 14, 2017 10:44
# Conflicts:
#	glide.lock
#	glide.yaml
#	test/e2e/framework/clusteralerts.go
#	test/e2e/framework/nodealerts.go
#	test/e2e/framework/podalerts.go
#	test/e2e/junit.xml
#	vendor/k8s.io/apiserver/pkg/util/wsstream/conn.go
@tamalsaha tamalsaha merged commit cb2e2c0 into master Sep 14, 2017
@tamalsaha tamalsaha deleted the use-kutil branch September 14, 2017 07:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants