[or-cvs] r20291: {projects} Note merge of bandwidth-voting-final branch (projects/todo)

[nickm@xxxxxxxx]

Author: nickm
Date: 2009-08-14 17:15:31 -0400 (Fri, 14 Aug 2009)
New Revision: 20291

Modified:
   projects/todo/git-branches
Log:
Note merge of bandwidth-voting-final branch

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2009-08-14 19:37:31 UTC (rev 20290)
+++ projects/todo/git-branches	2009-08-14 21:15:31 UTC (rev 20291)
@@ -1,9 +1,10 @@
 Active branches to merge or improve:
 
-- Mikeperry's bw voting stuff:
-  - mikeperry/bandwidth-voting-final
+o Mikeperry's bw voting stuff:
+  o mikeperry/bandwidth-voting-final
+    [merged to master -NM]
   o mikeperry/bandwidth-proposals-final (updates proposals)
-    [merged to master-NM]
+    [merged to master -NM]
 
 - Updated Linux QoS scripts (still have a couple more changes to go)
   mikeperry/linux-qos