github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
30,744 Commits
31 Branches
881 Tags
633 MiB
Commit Graph

30744 Commits (fae7285b00a5f320b2e0fb993eee07be09c1c582)

Author SHA1 Message Date
k8s-merge-robot d82f3bf305 Merge pull request #27561 from nikhiljindal/fixFedTest 
Automatic merge from submit-queue

Adding a wait for federation apiserver to be ready in e2e tests

Ref #26762

@kubernetes/sig-cluster-federation @mml
 2016-06-16 17:10:05 -07:00
k8s-merge-robot 7c97ca596e Merge pull request #27515 from mfanjie/ensuredns-multi-clusters 
Automatic merge from submit-queue

federation: only reachable endpoint should be treated as healthy

@quinton-hoole it seems all Ingress IP for the same service is treated as healthy, so I made a fix to filter the Ingress without ready endpoints.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
 2016-06-16 17:10:00 -07:00
k8s-merge-robot b41405ed22 Merge pull request #27480 from mml/fed-service-clusterip 
Automatic merge from submit-queue

Clear ClusterIP in the local service before comparison.

For #26762
 2016-06-16 17:09:56 -07:00
k8s-merge-robot 646a872f15 Merge pull request #27415 from caesarxuchao/fix-oldrc 
Automatic merge from submit-queue

fix updatePod() of RS and RC controllers

Fix updatePod of replication controller manager and replica set controller to handle pod label updates that match no RC or RS.

Fix #27405
 2016-06-16 17:09:53 -07:00
k8s-merge-robot 8a89ea6058 Merge pull request #27568 from lavalamp/faster 
Automatic merge from submit-queue

Make unit tests faster
 2016-06-16 16:11:05 -07:00
k8s-merge-robot 6e3d37e314 Merge pull request #26399 from ixdy/jenkins-unittest-build 
Automatic merge from submit-queue

Avoid duplicate building in Jenkins unit/integration job

Partially adopts #26392: don't run `hack/build-go.sh` in the unit/integration job, since we do that already for e2e.

We do need to still build kubectl, however, so do that in `hack/test-cmd.sh`.

x-ref #25940
 2016-06-16 16:11:01 -07:00
nikhiljindal ec6543e1e2 Adding a wait for federation apiserver to be ready in e2e tests 2016-06-16 15:34:45 -07:00
Yifan Gu d96c7edc34 cluster/saltbase: Enable rkt to load master components images. 2016-06-16 15:18:52 -07:00
Yifan Gu 16d69f9f37 cluster/gce/coreos: Update addon manifests, add node-problem-detector. 
Also bumped CNI version.
 2016-06-16 15:18:52 -07:00
Yifan Gu f3c5d4e62b cluster/gce/coreos: Update the cloud config and scripts to enable rkt runtime. 2016-06-16 15:18:52 -07:00
k8s-merge-robot 3c7f70543b Merge pull request #27364 from gmarek/schedulerPredicates 
Automatic merge from submit-queue

Fix SchedulerPredictes resources test

Fix #27115 (the part that's not a dupe).

cc @fejta
 2016-06-16 14:45:38 -07:00
Daniel Smith 22eac7e56a stop double testing, extra coverage not worth the time 2016-06-16 14:44:25 -07:00
Daniel Smith 8af08f90b5 remove unused prefix code, fix comment 2016-06-16 14:29:40 -07:00
derekwaynecarr de95be0a76 Fix typo in kubelet help 2016-06-16 15:48:23 -04:00
k8s-merge-robot 0856e1dd43 Merge pull request #27390 from mml/fed-service-type 
Automatic merge from submit-queue

Compare v1.Service to v1.Service.
 2016-06-16 12:45:00 -07:00
k8s-merge-robot a448313f01 Merge pull request #27188 from rootfs/pd-fix-flakey 
Automatic merge from submit-queue

in each pd test, create and delete the pod for every iteration to give new pod name for exec

fix #26141
based on chat with @ncdc

The following is a snapshot of the log. Each iteration now has a new Pod name
```text
[It] should schedule a pod w/two RW PDs both mounted to one container, write to PD, verify contents, delete pod, recreate pod, verify contents, and repeat in rapid succession [Slow] [Flaky]
  /srv/dev/kubernetes/_output/local/go/src/k8s.io/kubernetes/test/e2e/pd.go:277
STEP: creating PD1
Jun 10 15:55:45.878: INFO: Successfully created a new PD: "rootfs-e2e-c8b82df9-2f23-11e6-a5a0-b8ca3a62792c".
STEP: creating PD2
Jun 10 15:55:49.794: INFO: Successfully created a new PD: "rootfs-e2e-cb135362-2f23-11e6-a5a0-b8ca3a62792c".
Jun 10 15:55:49.794: INFO: PD Read/Writer Iteration #0
STEP: submitting host0Pod to kubernetes
W0610 15:55:49.860308   17282 request.go:347] Field selector: v1 - pods - metadata.name - pd-test-cd68f34b-2f23-11e6-a5a0-b8ca3a62792c: need to check if this is versioned correctly.
STEP: writing a file in the container
Jun 10 15:56:09.792: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-cd68f34b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- /bin/sh -c echo '988876932586416926' > '/testpd1/tracker0''
Jun 10 15:56:12.003: INFO: Wrote value: "988876932586416926" to PD1 ("rootfs-e2e-c8b82df9-2f23-11e6-a5a0-b8ca3a62792c") from pod "pd-test-cd68f34b-2f23-11e6-a5a0-b8ca3a62792c" container "mycontainer"
STEP: writing a file in the container
Jun 10 15:56:12.003: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-cd68f34b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- /bin/sh -c echo '8414937992264649637' > '/testpd2/tracker0''
Jun 10 15:56:13.170: INFO: Wrote value: "8414937992264649637" to PD2 ("rootfs-e2e-cb135362-2f23-11e6-a5a0-b8ca3a62792c") from pod "pd-test-cd68f34b-2f23-11e6-a5a0-b8ca3a62792c" container "mycontainer"
STEP: reading a file in the container
Jun 10 15:56:13.170: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-cd68f34b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd1/tracker0'
Jun 10 15:56:14.325: INFO: Read file "/testpd1/tracker0" with content: 988876932586416926

STEP: reading a file in the container
Jun 10 15:56:14.325: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-cd68f34b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd2/tracker0'
Jun 10 15:56:15.590: INFO: Read file "/testpd2/tracker0" with content: 8414937992264649637

STEP: deleting host0Pod
Jun 10 15:56:15.841: INFO: PD Read/Writer Iteration #1
STEP: submitting host0Pod to kubernetes
W0610 15:56:15.905485   17282 request.go:347] Field selector: v1 - pods - metadata.name - pd-test-dcef71e1-2f23-11e6-a5a0-b8ca3a62792c: need to check if this is versioned correctly.
STEP: reading a file in the container
Jun 10 15:56:16.832: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-dcef71e1-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd1/tracker0'
Jun 10 15:56:18.132: INFO: Read file "/testpd1/tracker0" with content: 988876932586416926

STEP: reading a file in the container
Jun 10 15:56:18.132: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-dcef71e1-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd2/tracker0'
Jun 10 15:56:19.354: INFO: Read file "/testpd2/tracker0" with content: 8414937992264649637

STEP: writing a file in the container
Jun 10 15:56:19.354: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-dcef71e1-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- /bin/sh -c echo '7639503234625274799' > '/testpd1/tracker1''
Jun 10 15:56:20.526: INFO: Wrote value: "7639503234625274799" to PD1 ("rootfs-e2e-c8b82df9-2f23-11e6-a5a0-b8ca3a62792c") from pod "pd-test-dcef71e1-2f23-11e6-a5a0-b8ca3a62792c" container "mycontainer"
STEP: writing a file in the container
Jun 10 15:56:20.526: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-dcef71e1-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- /bin/sh -c echo '7400445987108171911' > '/testpd2/tracker1''
Jun 10 15:56:21.694: INFO: Wrote value: "7400445987108171911" to PD2 ("rootfs-e2e-cb135362-2f23-11e6-a5a0-b8ca3a62792c") from pod "pd-test-dcef71e1-2f23-11e6-a5a0-b8ca3a62792c" container "mycontainer"
STEP: reading a file in the container
Jun 10 15:56:21.694: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-dcef71e1-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd1/tracker0'
Jun 10 15:56:22.904: INFO: Read file "/testpd1/tracker0" with content: 988876932586416926

STEP: reading a file in the container
Jun 10 15:56:22.905: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-dcef71e1-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd2/tracker0'
Jun 10 15:56:24.080: INFO: Read file "/testpd2/tracker0" with content: 8414937992264649637

STEP: reading a file in the container
Jun 10 15:56:24.081: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-dcef71e1-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd1/tracker1'
Jun 10 15:56:25.290: INFO: Read file "/testpd1/tracker1" with content: 7639503234625274799

STEP: reading a file in the container
Jun 10 15:56:25.290: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-dcef71e1-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd2/tracker1'
Jun 10 15:56:26.491: INFO: Read file "/testpd2/tracker1" with content: 7400445987108171911

STEP: deleting host0Pod
Jun 10 15:56:26.756: INFO: PD Read/Writer Iteration #2
STEP: submitting host0Pod to kubernetes
W0610 15:56:26.821828   17282 request.go:347] Field selector: v1 - pods - metadata.name - pd-test-e370dd2b-2f23-11e6-a5a0-b8ca3a62792c: need to check if this is versioned correctly.
STEP: reading a file in the container
Jun 10 15:56:27.898: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-e370dd2b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd1/tracker1'
Jun 10 15:56:29.096: INFO: Read file "/testpd1/tracker1" with content: 7639503234625274799

STEP: reading a file in the container
Jun 10 15:56:29.096: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-e370dd2b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd2/tracker1'
Jun 10 15:56:30.325: INFO: Read file "/testpd2/tracker1" with content: 7400445987108171911

STEP: reading a file in the container
Jun 10 15:56:30.325: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-e370dd2b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd1/tracker0'
Jun 10 15:56:31.528: INFO: Read file "/testpd1/tracker0" with content: 988876932586416926

STEP: reading a file in the container
Jun 10 15:56:31.529: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-e370dd2b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd2/tracker0'
Jun 10 15:56:32.972: INFO: Read file "/testpd2/tracker0" with content: 8414937992264649637

STEP: writing a file in the container
Jun 10 15:56:32.972: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-e370dd2b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- /bin/sh -c echo '1846555975530999997' > '/testpd1/tracker2''
Jun 10 15:56:34.157: INFO: Wrote value: "1846555975530999997" to PD1 ("rootfs-e2e-c8b82df9-2f23-11e6-a5a0-b8ca3a62792c") from pod "pd-test-e370dd2b-2f23-11e6-a5a0-b8ca3a62792c" container "mycontainer"
STEP: writing a file in the container
Jun 10 15:56:34.157: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-e370dd2b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- /bin/sh -c echo '2775947264799611726' > '/testpd2/tracker2''
Jun 10 15:56:35.661: INFO: Wrote value: "2775947264799611726" to PD2 ("rootfs-e2e-cb135362-2f23-11e6-a5a0-b8ca3a62792c") from pod "pd-test-e370dd2b-2f23-11e6-a5a0-b8ca3a62792c" container "mycontainer"
STEP: reading a file in the container
Jun 10 15:56:35.662: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-e370dd2b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd1/tracker0'
Jun 10 15:56:36.868: INFO: Read file "/testpd1/tracker0" with content: 988876932586416926

STEP: reading a file in the container
Jun 10 15:56:36.868: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-e370dd2b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd2/tracker0'
Jun 10 15:56:38.062: INFO: Read file "/testpd2/tracker0" with content: 8414937992264649637

STEP: reading a file in the container
Jun 10 15:56:38.062: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-e370dd2b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd1/tracker1'
Jun 10 15:56:39.221: INFO: Read file "/testpd1/tracker1" with content: 7639503234625274799

STEP: reading a file in the container
Jun 10 15:56:39.221: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-e370dd2b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd2/tracker1'
Jun 10 15:56:40.397: INFO: Read file "/testpd2/tracker1" with content: 7400445987108171911

STEP: reading a file in the container
Jun 10 15:56:40.397: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-e370dd2b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd1/tracker2'
Jun 10 15:56:41.584: INFO: Read file "/testpd1/tracker2" with content: 1846555975530999997

STEP: reading a file in the container
Jun 10 15:56:41.585: INFO: Running '/srv/dev/kubernetes/_output/local/bin/linux/amd64/kubectl exec --namespace=e2e-tests-pod-disks-2tvm2 pd-test-e370dd2b-2f23-11e6-a5a0-b8ca3a62792c -c=mycontainer -- cat /testpd2/tracker2'
Jun 10 15:56:42.800: INFO: Read file "/testpd2/tracker2" with content: 2775947264799611726

STEP: deleting host0Pod
```

@saad-ali
 2016-06-16 12:44:56 -07:00
David McMahon 0fece08736 Run update-swagger-spec.sh and update-generated-protobuf.sh too. 2016-06-16 12:17:01 -07:00
Dan Williams a519e8a403 kubenet: clean up networking when setup errors occur 
Relying on the runtime to later call cleanup is fragile, so make sure
that everything gets nicely cleaned up when setup errors occur.
 2016-06-16 13:53:28 -05:00
Jeff Grafton e880dbfd25 Update verify scripts to clean up even on failures 2016-06-16 11:45:26 -07:00
Dan Williams 965492fdd0 kubelet/kubenet: split hostport handling into separate module 2016-06-16 13:44:32 -05:00
Piotr Szczesniak 8fff5319db Bumped Heapster to v1.1.0 2016-06-16 20:41:28 +02:00
Prashanth Balasubramanian da6f964be4 Rewrite ingress e2es 2016-06-16 11:28:06 -07:00
Girish Kalele ee7ca66dba Add nethealth prepull container output to e2e run logs 2016-06-16 11:03:09 -07:00
k8s-merge-robot 3ba5816e46 Merge pull request #27536 from mwielgus/log-np-del 
Automatic merge from submit-queue

Log node-pool deletion in cluster autoscaler tests

cc: @piosz @jszczepkowski
 2016-06-16 10:55:21 -07:00
k8s-merge-robot d7d8d2e518 Merge pull request #27504 from nikhiljindal/debugfederationTests 
Automatic merge from submit-queue

Dumping logs of federation pods (federation-apiserver, federation-controller-manager) on e2e test failure

Ref https://github.com/kubernetes/kubernetes/issues/26762

This should help with debugging failures.
Right now there is no way to access those logs.

@kubernetes/sig-cluster-federation @colhom
 2016-06-16 10:55:16 -07:00
k8s-merge-robot cec153c915 Merge pull request #27488 from bprashanth/ing_e2e_fix 
Automatic merge from submit-queue

Call NewFramework constructor instead of hand creating framework.

https://github.com/kubernetes/kubernetes/issues/27486, probably because we defined a new clientConfigGetter for node e2es and this test was hand creating the framework.
 2016-06-16 10:55:12 -07:00
k8s-merge-robot 947f60843e Merge pull request #27481 from mml/fed-nslookup 
Automatic merge from submit-queue

fix nslookup invocation

The old way with 'sh -c' was not correct.

For #26762
 2016-06-16 10:55:08 -07:00
Yu-Ju Hong f279e36292 Don't remove all containers of deleted pods until sources are ready 
Without this fix, kubelet may assume a pod from a not-ready source has already
been deleted, and GC all its dead containers.
 2016-06-16 10:47:12 -07:00
Ryan Hitchman 85bfe175d1 Remove dead travis widget from README. 2016-06-16 10:38:00 -07:00
Jon Cope 07ffe9513b Overhauled pv e2e test to reflect common lifecycle 2016-06-16 10:00:40 -05:00
Marcin Wielgus c4787225ee Log node-pool deletion in cluster autoscaler tests 2016-06-16 14:01:24 +02:00
Piotr Szczesniak afedd3d34d Merge pull request #27533 from mwielgus/more-debug-in-e2e-ca 
More debug in Cluster Autoscaler e2e test
 2016-06-16 13:35:25 +02:00
Piotr Szczesniak 21da9bc87d Merge pull request #27531 from jszczepkowski/rc-img-prefetch 
Updated version of resource consumer in image puller.
 2016-06-16 12:17:32 +02:00
Marcin Wielgus 32b248fdbc More debug in Cluster Autoscaler e2e test 2016-06-16 12:00:55 +02:00
Jerzy Szczepkowski 390a30b130 Updated version of resource consumer in image puller. 
Updated version of resource consumer in image puller.
 2016-06-16 10:57:21 +02:00
Jan Safranek 26f90d2099 Add integration test for provisioning/deleting of many PVs. 
The test is configurable by KUBE_INTEGRATION_PV_OBJECTS for load tests,
100 objects are created by default.
 2016-06-16 10:14:49 +02:00
Piotr Szczesniak 7564523032 Merge pull request #27526 from kubernetes/revert-27422-burst 
Revert "Change default value of deleting-pods-burst to 1"
 2016-06-16 09:55:06 +02:00
Piotr Szczesniak 8d36ab9994 Revert "Change default value of deleting-pods-burst to 1" 2016-06-16 09:52:17 +02:00
Wojciech Tyczynski f24f6102a9 Don't set NetworkUnavailable condition in non-GCE/GKE clouds 2016-06-16 09:40:49 +02:00
Saad Ali 23f9d9f4cf Merge pull request #27491 from yujuhong/shorter_timeout 
Set the podAttachAndMountTimeout to a lower value
 2016-06-15 22:57:33 -07:00
Justin Santa Barbara e58a16e95a AWS kube-down: Issue warning if VPC not found 
Issue #17219
 2016-06-15 23:53:57 -04:00
mfanjie 8630e46336 only reachable endpoint should be treated as healthy 2016-06-16 11:09:34 +08:00
k8s-merge-robot 523e83fbb0 Merge pull request #27495 from mml/fed-force-tag 
Automatic merge from submit-queue

Force docker tag change.
 2016-06-15 19:00:40 -07:00
Quinton Hoole 7b5265c493 Improve error detection and logging on DNS updates for federated services. 2016-06-15 17:30:08 -07:00
Matt Liggett adbd4d8029 Clear ClusterIP in the local service before comparison. 2016-06-15 17:17:55 -07:00
nikhiljindal ca22a28fff Dumping logs of federation pods on test failure 2016-06-15 17:07:05 -07:00
Matt Liggett 307f7cf308 Force docker tag change. 
Otherwise we sometimes get an error about an existing tag.
 2016-06-15 16:41:28 -07:00
David McMahon 4acd8803fe Run update-munge-docs.sh directly. 2016-06-15 16:35:06 -07:00
Yu-Ju Hong 9bc2b43064 Set the podAttachAndMountTimeout to a lower value 
If the mount operation exceeds the timeout, it will return an error and the
pod worker will retry in the next sync (10s or less). Compared with the
original value (i.e., 10 minutes), this frees the pod worker sooner to process
pod updates, if there are any.
 2016-06-15 16:01:15 -07:00
Daniel Smith 4a040d11ca Merge pull request #26032 from pmorie/improve-tests 
Testing improvements
 2016-06-15 15:44:33 -07:00