diff options
| author | Ben Pfaff <blp@nicira.com> | 2015-06-13 18:10:46 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2015-06-13 18:12:08 -0700 |
| commit | 03ce866e44835e43f04747cfc65b2c592d780165 (patch) | |
| tree | 1353eac489829102874e88bf631966dbfe58523d /configure.ac | |
| parent | 767944131928487497579fd48a8a1efa0ca0d676 (diff) | |
| parent | be9d0de7a40459507b0620bc7bc352f7b6b0942d (diff) | |
| download | openvswitch-03ce866e44835e43f04747cfc65b2c592d780165.tar.gz | |
Merge "master" into "ovn".
This allows OVN to take advantage of the client scalability changes
that have been committed to ovsdb-server on master recently.
Conflicts:
Makefile.am
lib/learn.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 70e3ab829..666ab8fc8 100644 --- a/configure.ac +++ b/configure.ac @@ -145,7 +145,6 @@ OVS_ENABLE_OPTION([-Wextra]) OVS_ENABLE_OPTION([-Wno-sign-compare]) OVS_ENABLE_OPTION([-Wpointer-arith]) OVS_ENABLE_OPTION([-Wformat-security]) -OVS_ENABLE_OPTION([-Wno-format-zero-length]) OVS_ENABLE_OPTION([-Wswitch-enum]) OVS_ENABLE_OPTION([-Wunused-parameter]) OVS_ENABLE_OPTION([-Wbad-function-cast]) |