Commit 8c6807e0 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents abed5101 e24f6da6
......@@ -128,18 +128,9 @@ main(int argc, char **argv)
if (!debug) {
loginit(1, "v0_gateway");
/* See below for daemonization */
pubsub_debug = (PUBSUB_DEBUG_CONNECT|
PUBSUB_DEBUG_RECONNECT|
PUBSUB_DEBUG_CALLBACK|
PUBSUB_DEBUG_DISPATCHER); /* XXX for now */
pubsub_debug = 1; /* XXX for now */
} else {
/* XXX backward compat */
pubsub_debug = (PUBSUB_DEBUG_CONNECT|
PUBSUB_DEBUG_RECONNECT|
PUBSUB_DEBUG_CALLBACK|
PUBSUB_DEBUG_DISPATCHER);
if (debug > 1)
pubsub_debug |= PUBSUB_DEBUG_DETAIL;
pubsub_debug = debug;
}
info("version0<->version1 gateway daemon starting\n");
......
......@@ -438,7 +438,7 @@ function WRITESIDEBAR() {
if ($rootEmulab) {
# Leave New here about 2 weeks
NavMenuButton("Papers and Talks (Apr 4)", "$TBDOCBASE/pubs.php3");
NavMenuButtonNew("Papers and Talks (Jul 18)", "$TBDOCBASE/pubs.php3");
NavMenuButton("Emulab Software (Sep 1)", "$TBDOCBASE/software.php3");
NavMenuButton("List People",
......
......@@ -23,6 +23,18 @@
<ul>
<li>
<img src="/new.gif" alt="&lt;NEW&gt;">
<cite><a
href="http://www.cs.utah.edu/flux/papers/tdls-cset10-base.html">
Trusted Disk Loading in the Emulab Network Testbed</a></cite>.
Cody Cutler, Mike Hibler, Eric Eide, and Robert Ricci.
In Proceedings of the
<a href="http://www.usenix.org/events/cset10/">Third Workshop on Cyber
Security Experimentation and Test&nbsp;(CSET)</a>,
Washington,&nbsp;DC,
August&nbsp;2010.
<p>
<li>
<cite><a
href="http://www.cs.utah.edu/flux/papers/ipathemu-nsdi09-base.html">
Modeling and Emulation of Internet Paths</a></cite>.
......@@ -36,7 +48,6 @@
<p>
<li>
<img src="/new.gif" alt="&lt;NEW&gt;">
<cite><a
href="http://www.cs.utah.edu/flux/papers/checkpoint-eurosys09-base.html">
Transparent Checkpoints of Closed Distributed Systems in
......@@ -63,7 +74,7 @@
Securing the Frisbee Multicast Disk Loader</a></cite>.
Robert Ricci and Jonathon Duerig.
In Proceedings of the
<a href="http://www.usenix.org/events/usenix08/">2008 Workshop on
<a href="http://www.usenix.org/events/cset08/">2008 Workshop on
Cyber Security Experimentation and Test</a>,
San&nbsp;Jose,&nbsp;CA, July&nbsp;2008.
<p>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment