diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2017-06-19 13:21:21 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2017-06-19 13:21:46 +0100 |
| commit | 9bd59f949df83594e434ea6b83b3bff841e6fd31 (patch) | |
| tree | faa977d7b7060b1058e338b33dda3f537fba3c21 /debian/dpdk.init | |
| parent | 1f784092de6f79612c6b1a4a4208f3abb03e7084 (diff) | |
| parent | e17e83e3a136be1a66eb1b580a4f049912b81657 (diff) | |
Merge branch '16.11.x' into 17.05.x
Conflicts:
app/test-pmd/parameters.c
app/test-pmd/testpmd.c
debian/changelog
debian/control
debian/patches/fix-vhost-user-socket-permission.patch
debian/rules
doc/guides/cryptodevs/qat.rst
doc/guides/nics/thunderx.rst
doc/guides/rel_notes/release_16_11.rst
drivers/net/i40e/i40e_rxtx_vec_neon.c
drivers/net/ixgbe/ixgbe_rxtx.c
drivers/net/mlx5/mlx5_rxtx.c
drivers/net/nfp/nfp_net.c
drivers/net/qede/qede_ethdev.c
drivers/net/thunderx/nicvf_struct.h
drivers/net/virtio/virtio_ethdev.c
drivers/net/virtio/virtio_pci.c
drivers/net/virtio/virtio_pci.h
drivers/net/virtio/virtio_user/virtio_user_dev.c
drivers/net/virtio/virtio_user/virtio_user_dev.h
drivers/net/virtio/virtio_user_ethdev.c
examples/dpdk_qat/main.c
examples/performance-thread/l3fwd-thread/main.c
examples/quota_watermark/qw/init.c
lib/librte_eal/bsdapp/eal/eal_pci.c
lib/librte_eal/common/include/rte_version.h
lib/librte_vhost/socket.c
lib/librte_vhost/vhost.c
lib/librte_vhost/vhost.h
pkg/dpdk.spec
test/test/test_mempool.c
Change-Id: I04809b1bcf4ecee4c171c5acb60a8a8aac8cc4a8
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'debian/dpdk.init')
| -rw-r--r-- | debian/dpdk.init | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/dpdk.init b/debian/dpdk.init index 01b47845..002ba29f 100644 --- a/debian/dpdk.init +++ b/debian/dpdk.init @@ -35,7 +35,7 @@ start) ;; stop) ;; -restart|force-reload) +try-restart|restart|force-reload) ;; status) output=$(/lib/dpdk/dpdk-init --status 2>&1) || error="$?" |