Merge branch 'parabola' into lukeshu/premove

# Conflicts:
#	Makefile.am

1 files changed, 23 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index 44de23ace7..37eb20c4b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@
 *.log
 *.o
 *.plist
-*.pyc
 *.stamp
 *.swp
 *.trs
@@ -40,7 +39,6 @@
 /hostnamectl
 /install-tree
 /journalctl
-/libsystemd-*.c
 /libtool
 /linuxx64.efi.stub
 /localectl
@@ -49,18 +47,14 @@
 /mtd_probe
 /networkctl
 /scsi_id
-/systemadm
 /systemctl
 /systemd
 /systemd-ac-power
-/systemd-activate
 /systemd-analyze
 /systemd-ask-password
 /systemd-backlight
 /systemd-binfmt
-/systemd-bootchart
 /systemd-bootx64.efi
-/systemd-bus-proxyd
 /systemd-cat
 /systemd-cgls
 /systemd-cgroups-agent
@@ -78,7 +72,6 @@
 /systemd-fsck
 /systemd-fstab-generator
 /systemd-getty-generator
-/systemd-gnome-ask-password-agent
 /systemd-gpt-auto-generator
 /systemd-hibernate-resume
 /systemd-hibernate-resume-generator
@@ -92,7 +85,6 @@
 /systemd-journal-remote
 /systemd-journal-upload
 /systemd-journald
-/systemd-kmsg-syslogd
 /systemd-localed
 /systemd-logind
 /systemd-machine-id-setup
@@ -107,7 +99,6 @@
 /systemd-quotacheck
 /systemd-random-seed
 /systemd-rc-local-generator
-/systemd-remount-api-vfs
 /systemd-remount-fs
 /systemd-reply-password
 /systemd-resolve
@@ -116,6 +107,7 @@
 /systemd-run
 /systemd-shutdown
 /systemd-sleep
+/systemd-socket-activate
 /systemd-socket-proxyd
 /systemd-stdio-bridge
 /systemd-sysctl
@@ -126,7 +118,6 @@
 /systemd-timesyncd
 /systemd-tmpfiles
 /systemd-tty-ask-password-agent
-/systemd-uaccess
 /systemd-udevd
 /systemd-update-done
 /systemd-update-utmp
@@ -136,6 +127,7 @@
 /test-acd
 /test-acl-util
 /test-af-list
+/test-alloc-util
 /test-architecture
 /test-arphrd-list
 /test-ask-password-api
@@ -143,7 +135,7 @@
 /test-audit-type
 /test-barrier
 /test-bitmap
-/test-boot-timestamp
+/test-boot-timestamps
 /test-btrfs
 /test-bus-benchmark
 /test-bus-chat
@@ -158,7 +150,6 @@
 /test-bus-match
 /test-bus-objects
 /test-bus-policy
-/test-bus-proxy
 /test-bus-server
 /test-bus-signature
 /test-bus-zero-copy
@@ -169,6 +160,7 @@
 /test-cgroup
 /test-cgroup-mask
 /test-cgroup-util
+/test-clock
 /test-compress
 /test-compress-benchmark
 /test-condition
@@ -176,6 +168,7 @@
 /test-conf-parser
 /test-copy
 /test-coredump-vacuum
+/test-cpu-set-util
 /test-daemon
 /test-date
 /test-device-nodes
@@ -185,25 +178,32 @@
 /test-dhcp-server
 /test-dhcp6-client
 /test-dns-domain
+/test-dns-packet
 /test-dnssec
 /test-efi-disk.img
 /test-ellipsize
 /test-engine
-/test-env-replace
+/test-env-util
+/test-escape
 /test-event
 /test-execute
 /test-extract-word
+/test-fd-util
 /test-fdset
 /test-fileio
 /test-firewall-util
+/test-fs-util
 /test-fstab-util
+/test-glob-util
 /test-hashmap
+/test-hexdecoct
 /test-hostname
 /test-hostname-util
 /test-id128
 /test-inhibit
 /test-install
 /test-install-root
+/test-io-util
 /test-ipcrm
 /test-ipv4ll
 /test-ipv4ll-manual
@@ -218,7 +218,6 @@
 /test-journal-stream
 /test-journal-syslog
 /test-journal-verify
-/test-json
 /test-libsystemd-sym*
 /test-libudev
 /test-libudev-sym*
@@ -237,32 +236,37 @@
 /test-ndisc-rs
 /test-netlink
 /test-netlink-manual
+/test-networkd-conf
 /test-network
 /test-network-tables
 /test-ns
+/test-nss
 /test-parse-util
+/test-patch-uid
 /test-path
 /test-path-lookup
 /test-path-util
 /test-prioq
+/test-proc-cmdline
 /test-process-util
 /test-pty
 /test-qcow2
 /test-ratelimit
-/test-rbtree
 /test-replace-var
 /test-resolve
 /test-resolve-tables
 /test-ring
 /test-rlimit-util
 /test-sched-prio
+/test-selinux
 /test-set
+/test-sizeof
 /test-sigbus
 /test-signal-util
 /test-siphash24
 /test-sleep
 /test-socket-util
-/test-ssd
+/test-stat-util
 /test-strbuf
 /test-string-util
 /test-strip-tab-ansi
@@ -282,6 +286,8 @@
 /test-util
 /test-verbs
 /test-watchdog
+/test-web-util
+/test-xattr-util
 /test-xml
 /timedatectl
 /udevadm
@@ -289,6 +295,7 @@
 /v4l_id
 Makefile.in
 __pycache__/
+*.py[co]
 aclocal.m4
 config.h
 config.h.in