summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS14
-rw-r--r--TODO4
2 files changed, 8 insertions, 10 deletions
diff --git a/NEWS b/NEWS
index 0fa69e5d5e..6612a4872c 100644
--- a/NEWS
+++ b/NEWS
@@ -109,12 +109,14 @@ CHANGES WITH 226:
an alternative to configuring container parameters via the
nspawn command line.
- Contributions from: Cristian Rodríguez, Daniel Mack, David Herrmann,
- Eugene Yakubovich, Evgeny Vereshchagin, Filipe Brandenburger, Jan
- Alexander Steffens (heftig), Jan Synacek, Kay Sievers, Lennart
- Poettering, Mangix, Marcel Holtmann, Martin Pitt, Michal Sekletar, Peter
- Hutterer, Piotr Drąg, reverendhomer, Robin Hack, Susant Sahani, Sylvain
- Pasche, Thomas Hindoe Paaboel Andersen, Tom Gundersen
+ Contributions from: Cristian Rodríguez, Daniel Mack, David
+ Herrmann, Eugene Yakubovich, Evgeny Vereshchagin, Filipe
+ Brandenburger, Hans de Goede, Jan Alexander Steffens, Jan
+ Synacek, Kay Sievers, Lennart Poettering, Mangix, Marcel
+ Holtmann, Martin Pitt, Michael Biebl, Michael Chapman, Michal
+ Sekletar, Peter Hutterer, Piotr Drąg, reverendhomer, Robin
+ Hack, Susant Sahani, Sylvain Pasche, Thomas Hindoe Paaboel
+ Andersen, Tom Gundersen,
-- Berlin, 2015-09-XX
diff --git a/TODO b/TODO
index 587f17bc5e..4fdecebd0f 100644
--- a/TODO
+++ b/TODO
@@ -26,8 +26,6 @@ External:
Features:
-* sd-event: somehow handle multiple queued incoming signals
-
* sd-event: maybe add support for inotify events
* PID 1 should send out sd_notify("WATCHDOG=1") messages (for usage in the --user mode, and when run via nspawn)
@@ -205,8 +203,6 @@ Features:
* "machinectl list-images" should show os-release data, as well as machine-info data (including deployment level)
-* nspawn: when start a container "foobar" look for its configuration in a file "foobar.nspawn" in /etc/systemd/nspawn/ as well as next to the actualy directory or image to boot
-
* Port various tools to make use of verbs.[ch], where applicable
* "machinectl history"