test merge

2013-06-12 12:46:32 +01:00
parent 48b0758840
commit f873253f0e
1 changed files with 5 additions and 5 deletions
--- a/10
+++ b/10
@@ -1,24 +1,24 @@
 FRONTEND
 ========

-* NetAddr::MAC ?
-
 * moar reports
 * (jeneric) device module tab

+DAEMON
+======
+
 BACKEND
 =======

 * db connect params as separate settings
 * new DBIC multi-prefetch
 * PING from workers
-
-DAEMON
-======
+* ask to set up guest user in deploy script

 CORE
 ====

+* NetAddr::MAC ?
 * VRF support
 * import legacy config file