Merge 'master' into 'next'.
[openvswitch] / debian / .gitignore
index 3a6b6bb81e3fa58e84d4aa56ffc4e4fa1175409d..3ebb73b5f4549b3d86a09b2d7e9695006f2a4919 100644 (file)
@@ -2,7 +2,7 @@
 *.debhelper.log
 *.substvars
 /control
-/corekeeper
+/copyright
 /files
 /nicira-switch
 /openvswitch
@@ -11,8 +11,8 @@
 /openvswitch-controller
 /openvswitch-datapath-source
 /openvswitch-dbg
+/openvswitch-ipsec
 /openvswitch-pki
-/openvswitch-pki-server
 /openvswitch-switch
-/openvswitch-switch-config
 /openvswitch-switch.copyright
+/python-openvswitch