cleaning up botched merges from og-work

Netdisco/bin/netdisco-web-fg

@@ -20,10 +20,6 @@ BEGIN {
     dir($FindBin::RealBin, 'lib')->stringify;
 }
 
-if ($ENV{_} and $ENV{_} =~ m/netdisco-web-fg$/) {
-    die "You probably want: '~/bin/localenv starman $0 --workers=1 --disable-keepalive'\n";
-}
-
 use App::Netdisco;
 use Dancer;
 debug sprintf "App::Netdisco %s", ($App::Netdisco::VERSION || 'HEAD');

Netdisco/lib/App/Netdisco/DB/Result/Device.pm

@@ -65,8 +65,6 @@ __PACKAGE__->add_columns(
   { data_type => "integer", is_nullable => 1 },
   "snmp_comm",
   { data_type => "text", is_nullable => 1 },
-  "snmp_comm_rw",
-  { data_type => "text", is_nullable => 1 },
   "snmp_class",
   { data_type => "text", is_nullable => 1 },
   "vtp_domain",

Netdisco/share/views/ajax/admintask/jobqueue.tt

@@ -13,21 +13,7 @@
       <th class="nd_center-cell">User</th>
       <th class="nd_center-cell">Started</th>
       <th class="nd_center-cell">Finished</th>
-      <th class="nd_center-cell">
+      <th class="nd_center-cell">Action</th>
-          <div class="btn-group">
-            <button class="btn dropdown-toggle" data-toggle="dropdown">
-              Action
-              <span class="caret"></span>
-            </button>
-            <ul class="dropdown-menu nd_no-min-width">
-              <li>
-                <a class="nd_adminbutton" name="delall" href="#">
-                  <i class="icon-trash text-error"></i> Empty Queue
-                </a>
-              </li>
-            </ul>
-          </div>
-      </th>
     </tr>
   </thead>
   </tbody>

TODO

@@ -23,8 +23,6 @@ CORE
 DOCS
 ====
 
-* missing user management ("User Rights")
-
 * Scheduler
 * Discover/Refresh jobs
 * new X:: plugin namespace