diff options
author | Justin Pettit <jpettit@nicira.com> | 2015-05-07 16:52:06 -0700 |
---|---|---|
committer | Justin Pettit <jpettit@nicira.com> | 2015-05-07 16:52:06 -0700 |
commit | f2d371f7f6e765d8e97a3bd31fffa8197bd45fe2 (patch) | |
tree | 06ed5bd8c1c0fa2f6d9add596c6efe0f0ef94228 /tests/testsuite.at | |
parent | e387e3e885222651f11a23c401e9e27fca3362ef (diff) | |
parent | 88c98bf5635c732d4c77e5314ec7440a08a09dec (diff) | |
download | openvswitch-f2d371f7f6e765d8e97a3bd31fffa8197bd45fe2.tar.gz |
Merge "master" into "ovn".
This brings in STT.
Conflicts:
tutorial/ovs-sandbox
Diffstat (limited to 'tests/testsuite.at')
-rw-r--r-- | tests/testsuite.at | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/testsuite.at b/tests/testsuite.at index 80bbcd59b..92b788b9f 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -53,6 +53,7 @@ m4_include([tests/reconnect.at]) m4_include([tests/ovs-vswitchd.at]) m4_include([tests/ofproto.at]) m4_include([tests/dpif-netdev.at]) +m4_include([tests/dpctl.at]) m4_include([tests/ofproto-dpif.at]) m4_include([tests/bridge.at]) m4_include([tests/vlan-splinters.at]) |