Skip to content

Commit

Permalink
Merge pull request #546 from amudukutore/cp_hm_ut
Browse files Browse the repository at this point in the history
Merge pull request #545 from edarzins/cccl-hm-fix
  • Loading branch information
edarzins authored Feb 2, 2018
2 parents 3dffe65 + 23728ff commit 94dbfec
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions python/tests/kubernetes_one_svc_two_nodes.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
"interval": 30,
"name": "default_configmap_0_tcp",
"send": "GET /",
"timeout": 20,
"timeout": 40,
"type": "tcp"
},
{
"interval": 10,
"name": "default_configmap_1_0_http",
"send": "GET /",
"timeout": 5,
"timeout": 15,
"type": "http"
}
],
Expand Down
4 changes: 2 additions & 2 deletions python/tests/kubernetes_one_svc_two_nodes_expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"interval": 30,
"name": "default_configmap_0_tcp",
"send": "GET /",
"timeout": 20,
"timeout": 40,
"type": "tcp"
},
{
"interval": 10,
"name": "default_configmap_1_0_http",
"send": "GET /",
"timeout": 5,
"timeout": 15,
"type": "http"
}
],
Expand Down
2 changes: 1 addition & 1 deletion python/tests/kubernetes_one_udp_svc_two_nodes.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"interval": 30,
"name": "default_configmap_0_udp",
"send": "GET /",
"timeout": 20,
"timeout": 40,
"type": "udp"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"interval": 30,
"name": "default_configmap_0_udp",
"send": "GET /",
"timeout": 20,
"timeout": 40,
"type": "udp"
}
],
Expand Down

0 comments on commit 94dbfec

Please sign in to comment.