or
Printable version of this document
<![CDATA[
commit 65f6319773dda32b32acb44308e55e5bc1aa0f02
Merge: fa1c524 616b019
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-30 10:49:40 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit fa1c524be7d9719db8872ef1a69ab8ce4bcda4bd
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-30 10:49:11 -0600
Minor tweak to how we control the use of Archiving; use only the
ARCHIVESUPPORT variable from configure.
2 2 db/Archive.pm.in
2 2 tbsetup/libArchive.pm.in
commit 80f24eba207970df71c7d0d4aa92e652447d96fe
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-30 10:48:25 -0600
Turn off the Archive support until someone picks this up again.
We are burning up disk space with this for no reason.
1 1 defs-default
commit 616b019d22a7d5b42cd5b3b0764371f17a526b82
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-30 11:05:47 -0400
Remove extraneous debug output.
0 2 protogeni/lib/GeniCMV2.pm.in
commit 826746ac15fbdb207104ffa7eca1a8d849ba2f6c
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-29 17:25:43 -0600
Fix checking of erole for subbosses
2 2 xmlrpc/emulabserver.py.in
commit ec2c4e18b247309e68494e27e8d60ae4f1c10832
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-29 17:12:59 -0600
Add syslog config for frisbeed
2 0 tmcd/common/config/rc.mksubboss
commit d7c7130c603b31c0f915744757443d5d77bed079
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-29 16:25:35 -0600
Allow dhcpd_makeconf work correctly for non-root
Make sure that dhcpd_makeconf sets UID to 0 before calling ssh
so that we use root's keypair to log into the subboss. Drop
root privileges again afterward.
4 1 db/dhcpd_makeconf.in
commit 1d8bae476ca31d4b1df2846f8c8451757d51c95f
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-29 16:16:20 -0600
Fix syslog configuration for subbosses
Make sure that dhcpd, tftpd, and frisbeed all log to /usr/testbed/log
instead of /var/log, and set up log rotation for them.
31 4 tmcd/common/config/rc.mksubboss
commit 7820bdc5ac50bcbf767d91b0c8c78cd0b8f7d650
Author: Jonathon Duerig <duerig@boss.emulab.net>
Date: 2010-06-29 14:58:32 -0600
Add ResiliNets to special projects.
1 1 tbsetup/tbswap.in
commit f4e828ee349b611be95222c512ea77bab1879a43
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-29 13:19:08 -0600
Add geni to special projects.
1 1 tbsetup/tbswap.in
commit c3a2abbfa82a2085085b837a77aac57736868125
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-29 09:26:41 -0600
Minor change to comment.
2 1 tbsetup/libossetup.pm.in
commit 0c404afa9283c03587b82c523e8c05e221636927
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-29 09:08:14 -0600
Minor bug fix to StartSlivers() failure handling; there is no ticket,
must use the manifest.
3 4 db/libGeni.pm.in
commit e99955deaaee686e1aa4450486a7635f6571f215
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-28 20:37:59 -0600
Bug fix: interface name may not be null-terminated, don't assume it.
Take proper code from the current ifconfig.
Thanks Guilherme!
8 3 tmcd/findif.c
commit ef7567a3f6cb1661e95f123b70bdf39c5197a200
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-28 17:04:04 -0600
New PHP5 port.
Analog to emulab-php4 port, just adds some Emulab-needed flags to the basic
configuration.
40 0 install/ports/emulab-php5/Makefile
2 0 install/ports/emulab-php5/pkg-descr
1 0 install/ports/emulab-php5/pkg-plist
commit 4fe3217bf8187ec2c1a357c75d25c7e9d4fac018
Merge: f19c126 122b6fe
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-28 15:54:09 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit f19c12669631d1133849adf329fb5fdcb2970c11
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-28 15:49:46 -0600
Hmm, lost CHMOD variable.
3 2 tmcd/freebsd/liblocsetup.pm
2 1 tmcd/linux/liblocsetup.pm
commit 122b6fe8fa5c5206de9475def563a91807372665
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-28 09:57:45 -0600
Fix an argument parsing error.
In our sed 's///' commands applied to loadinfo we were assuming that if a
variable pattern didn't match, we would get back an empty string. But what
we really get back is the entire loadinfo string. Now sure how this ever
worked (if it ever did!)
Also did the piss-on-it thing.
74 65 tmcd/freebsd/rc.frisbee
commit f58c4836f3c2d7d63fef35b5c3ec38cd21b15ed3
Author: Robert Ricci <ricci@cs.utah.edu>
Date: 2010-06-28 00:41:07 -0600
Fix dumb bug in ptopgen
My attempt to make the 'procurve1' hack apply only to Utah backfired
and removed the LAN node for all sites not at Utah. Bah!
1 1 tbsetup/ptopgen.in
commit 3a5bf377d2967075df6046017c32cf1c4a563264
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-25 15:42:05 -0600
elabinelab fixes.
Important: re-map emulab-ops pid/gid indicies in the os_info and images table.
Nit: fix a comment typo ("all I did was change a comment, really!")
22 3 db/elabinelab_bossinit.in
1 1 tbsetup/elabinelab.in
commit 118ff8ddc8b157f8122420aeb8616a1d2da6d321
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-25 10:08:53 -0600
Nit: fix another PHP error.
Use of undefined variables in the construction of an error message.
3 2 www/beginexp_xml.php3
commit c37e6de8178b767216f5d2b319679b0dfb51f44e
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-25 09:55:46 -0600
Add a bunch of missing PHP "?>" end tags.
Turns out these were not the cause of a problem I had with PHP5, but they
should be fixed anyway.
2 1 www/dbcheck.php3
1 2 www/experiment_defs.php
1 1 www/geni_defs.php
2 2 www/group_defs.php
2 2 www/node_defs.php
1 2 www/nodetipacl.php3
1 1 www/osinfo_defs.php
1 0 www/project_defs.php
2 1 www/unregister_globals.php
2 3 www/url_defs.php
1 0 www/user_defs.php
commit 59db2f28937e84d7ef1612c4cacb1c60f47745c1
Merge: 4f97931 6466b2d
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-25 07:58:43 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 4f979315e7949adb2aa5066954ae7ca772142560
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-25 07:58:08 -0600
Roll out new os_setup to utahstud and tbres projects. More testing.
1 1 tbsetup/tbswap.in
commit 959e2d4395904b40a856b2a7630f3b02bcda9b66
Author: Tarun Prabhu <tarunp@flux.utah.edu>
Date: 2010-06-24 13:27:06 -0600
Cleared up yet another merge conflict in the advertisement parser and updated the makefile for assign
1 1 assign/GNUmakefile.in
1 9 assign/parse_advertisement_rspec.cc
commit 6466b2d8ed709fd449de52f772bacf8e080cf98c
Merge: fe8b2fd 01592d8
Author: Robert Ricci <ricci@cs.utah.edu>
Date: 2010-06-24 12:03:44 -0600
Merge remote branch 'tom/am-users'
commit fe8b2fd069dd61167e2807318f7fdd669e069be4
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-24 11:24:59 -0600
Make double-sure that we don't do install from these directories in a devtree.
They are not in the top level GNUmakefile install, but if someone were to
manually install from their devtree, they would clobber the "master" versions.
This is because of the way that INSTALL_RCDIR and INSTALL_APACHE_CONFIG are
set in Makeconf.in. They are not prefixed with ${prefix} since they can be
set directly via configure command line "--with" arguments.
11 1 apache/GNUmakefile.in
12 1 rc.d/GNUmakefile.in
commit 42ce0cf01493ae421935ff2ad6ecc6fcca0b4add
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-24 11:01:40 -0600
Remove apache from SUBDIRS list; we do not want it installed, only
built. Turns out it was already in the just-builddirs target. Sheesh.
1 1 GNUmakefile.in
commit 88efed31d9786ea1937b4dd1039c1a2d036480b9
Merge: c0c581e b92800d
Author: Tarun Prabhu <tarunp@flux.utah.edu>
Date: 2010-06-24 10:54:13 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
Conflicts:
tbsetup/libvtop.pm.in
commit 01592d8504cbc5601e0421553a758d44e3d30355
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-18 16:25:35 -0400
Partial implementation of the CreateSliver users arg.
Implemented ssh key passing for the invoker of CreateSlice. Other
users are not supported yet.
34 3 protogeni/lib/GeniAM.pm.in
commit 57b3dfb111d3521cc9cdd18dab2aa4f058c6ad9b
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-18 16:22:24 -0400
Fix some string comparisons.
2 2 protogeni/lib/GeniAM.pm.in
commit b92800d7f6abb661a0d2569d4a99c4a8e75e89c2
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-24 09:57:41 -0600
Gack, spell it correctly!
1 1 protogeni/scripts/GNUmakefile.in
commit 76a416c5aeeb543ff7fd71b74fd2c2fa2ec1857a
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-24 09:53:32 -0600
Minor fix to previous revision.
1 1 protogeni/scripts/GNUmakefile.in
commit 858145b27275cd521d4b165968ef1c88f9f64e91
Merge: 0527e3e 84ddb1d
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-23 17:21:54 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 0527e3eefd4f400ef8d4738deae90cac65fdd369
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-23 17:21:30 -0600
Fixes for loopback links.
7 0 protogeni/lib/GeniCM.pm.in
commit 84ddb1d467d0a61e5f6849318e25c70d179e718b
Merge: 9eebc3f 5df263b
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-23 17:21:10 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 9eebc3f442f3fe01863707207b891f6580cc04c4
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-23 17:20:33 -0600
Fixes for loopback links.
27 21 db/libGeni.pm.in
9 3 tbsetup/libvtop.pm.in
commit 5df263b8d38dbffad773bbe6096f0d9b670c7c2f
Merge: 4f58153 4ac00ce
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-23 16:22:26 -0600
Merge remote branch 'central/master'
commit 4f581537975f2f790f182f0d7c22e8bc124ff8dc
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-23 16:21:28 -0600
Bug fix: make sure we pass back the value we actually care about in vlansv2!
1 1 xmlrpc/emulabserver.py.in
commit 4ac00cef1b78c9be3e67ddbde4c997d399362a1f
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-23 14:15:44 -0600
create subboss image cache dir on first boot
8 0 tbsetup/subboss_frisbeelauncher.in
3 1 tmcd/common/config/rc.mksubboss
commit 7f650e8b0b8b48e4809fc4f257900f5ef1ee09e0
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-18 16:04:05 -0600
add libosload support for frisbee subbosses
40 0 db/Node.pm.in
4 2 tbsetup/GNUmakefile.in
24 0 tbsetup/libosload.pm.in
81 0 tbsetup/subboss_frisbeelauncher_wrapper
commit a2ae7028be345c5fba190ffb8079bfe03aa2549a
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-21 17:52:59 -0600
Return frisbee server IP in loadinfo
1 1 tmcd/decls.h
4 5 tmcd/freebsd/rc.frisbee
6 3 tmcd/linux/rc.frisbee
16 2 tmcd/tmcd.c
commit c8f791b933bc6cd4d16e0252fc1e846527167847
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-21 18:31:39 -0600
update XML-RPC calls
1 1 tbsetup/subboss_frisbeeimage.in
22 21 tbsetup/subboss_frisbeelauncher.in
commit 6629bc894df3979d3b396207c869d2aac58767d9
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-21 18:29:02 -0600
fixed bug when verifying subboss requests
1 0 xmlrpc/emulabserver.py.in
commit 00f3aea8436a16e65547e21b593f1b9301ce68f7
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-23 15:17:21 -0600
removed unnecessary chown in post-install target
0 1 db/GNUmakefile.in
commit 2d4fa37d1c4b0519b6f8a986af1f2b5b20cb7e03
Merge: f34f900 916accc
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-23 14:51:43 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit f34f900d7b1803a5743a5d32230697981a2b432a
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-23 14:51:06 -0600
Do not kill the container if an error happens during a reboot of an
existing containter.
12 6 tmcd/linux/mkvnode.pl
commit 916accc297ebe1f2cf40b527baa5513e10aeac86
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-22 15:25:16 -0600
fix "#!" magic in rc.ipod
1 1 tmcd/freebsd/rc.ipod
1 1 tmcd/linux/rc.ipod
commit e9472de43abcd44e350cb9a1f331b5a67569f026
Merge: 06b7d83 9e8ab7f
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-23 14:17:15 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 06b7d83f9442edb855b475e3cbd7d83b760a742f
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-23 14:16:19 -0600
Add -e argument to use an existing container. Mostly for debugging
things.
Fix up hackwaitandexit() so that it notices failure and exits early
instead of waiting a full 60 seconds.
21 8 tmcd/common/vnodesetup
commit 18b3257f167cfa20311d53916dfb917aa03d40e6
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-23 14:15:18 -0600
Add "oneshot" mode so that I can feed the pool_daemon my own
ns file. Handy.
31 13 tbsetup/pool_daemon.in
commit 5bc8845d097ba433fdb83898788a6c7c02fc9595
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-23 14:14:30 -0600
Add -t (timestamps) and -V (virtual controlnetroutes) to vnode setup
call.
3 2 tbsetup/libreboot.pm.in
commit 25f8b5e1b9bff57386bd2b0b26c33432cfaff24a
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-23 14:12:49 -0600
Add a protogeni ClearingHouse daemon, to run only in Utah. All it
currently does is probe the known and enabled CMs and every 24 hours,
to see what version they are running (which says if they are online)
and then sends email to geni-dev-utah.
6 1 protogeni/scripts/GNUmakefile.in
224 0 protogeni/scripts/ch_daemon.in
8 0 rc.d/3.testbed.sh.in
commit 9e8ab7fd8d76183d6b5739591d88b56de13485ea
Merge: 83072f5 cba87b2
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-23 08:39:57 -0600
Merge remote branch 'central/master'
commit 83072f5b9e405558cdf4b663390a1200eaf33496
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-23 08:39:29 -0600
Fix my misuse of preg_split (gotta have a delimiter).
3 3 www/news-rss.php3
1 1 www/powertime.php3
commit cba87b22de9064291326e3a754d8878e56cda811
Merge: 8f03e35 e9cb4a3
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-23 08:03:07 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 8f03e35e3785bfd0b8f9d7c917b8271945296543
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-23 08:02:24 -0600
Minor bug fix.
1 1 protogeni/lib/GeniCM.pm.in
commit e9cb4a3f2009b628aed156a1e4054ea24f9069f9
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-22 17:40:17 -0600
Oops, mind yer slashes!
3 3 www/defs.php3.in
commit 9007d758c418d6f04f89030aa9e9ec17324ec9e1
Merge: 039dec5 45a5c7c
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-22 17:25:53 -0600
Merge remote branch 'central/master'
commit 039dec5121687d0fdbed856eb64f539c24d6fd0b
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-22 17:24:21 -0600
Fix a long-time problem revealed by PHP5.
A test of $decoded->{"code"} should have been $decoded{"code"}.
You do NOT want to know how long it took me to figure this out!
3 3 www/xmlrpc.php3.in
commit 9577ec16e2627e9f68916cb6ac8d54d0d3a56a3f
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-22 17:15:28 -0600
More PHP5 changes.
3 3 www/beginexp_form.php3
3 3 www/buildui/nssave.php3
6 6 www/cdromcheckin.php3
5 5 www/defs.php3.in
2 2 www/delaycontrol.php3
2 2 www/newnodelog.php3
3 3 www/spitnsdata.php3
commit 45a5c7c96f62448212cc1a10e152ba81cc163f46
Author: Kevin Atkinson <kevina@flux.utah.edu>
Date: 2010-06-22 16:15:31 -0600
Make assign_wrapper2 more robust in case of invalid assign output.
10 2 tbsetup/assign_wrapper2.in
commit 670fa25fd8cfc5de58543340ee5c42ce33628a4d
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-22 13:49:12 -0600
Minor change to print statement.
1 2 tbsetup/libossetup.pm.in
commit 53fc7653f06f675bacef8393236600d314e251f9
Merge: e19b2a9 8da2e96
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-22 12:14:43 -0600
Merge remote branch 'central/master'
commit e19b2a9396d0f65e684117fffa7b5d3e2ce78c21
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-22 12:14:03 -0600
PHP nits.
PHP5 a comin'
2 1 www/currentusage.php3
1 1 www/dbdefs.php3.in
4 4 www/news-rss.php3
2 2 www/plab_ez.php3
2 2 www/powertime.php3
commit 8da2e96aef34009a156f7205936a5df7647bf3e0
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-22 12:01:00 -0600
Add a newline to the "Creating Vlan" print statement so that the
output is flushed to the terminal.
1 1 tbsetup/snmpit_hp.pm
commit 684658085e6ef518840944e00fceba1e99cb80c6
Merge: c2a0826 a29732e
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-22 10:35:50 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit c2a082610dce13ac2c20f2f2fcd98481a2247a8e
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-22 10:34:51 -0600
Change the serialization between the mapper and the pool_daemon so
that 1) it actually works and 2) multiple mappers can run at the same
time, or the pool daemon.
Also add a nofree option to the pool daemon to prevent shrinkage.
Minor changes to the email notification when the pool daemon quits,
since I added and END block to ensure that the lock is released.
23 13 tbsetup/mapper.in
87 40 tbsetup/pool_daemon.in
commit a29732e87940e0c0c59e5e7d9f01f93593e8cf06
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-22 09:27:34 -0600
Nit: typo in error message.
2 2 tmcd/common/config/rc.linkagent
commit 0200b40a82c1518adb9fb1498a89e93e5e337836
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-22 09:26:35 -0600
Nit: set /var/emulab/boot/bossip contents correctly.
Cut and paste error. Doesn't matter since the file isn't used.
1 1 tmcd/linux/openvz/libvnode_openvz.pm
commit 75f6808373aba2285127200010a1098d8f0725be
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-22 09:25:14 -0600
Nit: make sure we don't pass back TPM-only info with fullconfig.
Also require SSL when returning a key hash.
7 3 tmcd/tmcd.c
commit 374ac709123ded2fd91a3b2c92240c9325fef82e
Author: Eric Eide <eeide@cs.utah.edu>
Date: 2010-06-21 23:20:01 -0600
In usage(), don't use `usagestr' as the `fprintf' format string.
Instead, print the usage string using "%s". This is a safety bug found by
-Wformat.
1 1 os/imagezip/imagezip.c
commit 90bca5d55170d3c00272ead4e7371ebf9acd38d8
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-21 17:54:01 -0600
Bug fix to the type consistency checking (the checks that make sure
only one osid,pctype maps to an image (osid2imageid).
5 3 backend/newimageid.in
commit 76eb561ca5a2acbae776cf1dc77898bdfe3cb0d9
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-21 16:03:24 -0600
Minor tweak so that this script can run inside a VM to prepare it.
18 13 tmcd/linux/prepare
commit d65ca782d4d460b217bebc00d57bbd229c9090d8
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-21 11:35:01 -0600
Minor bug fix to fix undefined hash access warning.
2 2 tbsetup/snmpit_hp.pm
commit 613a0ea40726b3173b0ef4c0e619319ed95fcd8e
Merge: 45f3138 37cde7f
Author: Jonathon Duerig <duerig@flux.utah.edu>
Date: 2010-06-21 10:56:55 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 6eb7aaf36dc509096e7b542b4cc6771bb1d0a57e
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-19 08:53:06 -0600
Make sure to chomp() the ssh keys to prevent newlines at the end,
which confuse things.
14 4 protogeni/lib/GeniUser.pm.in
commit a58f07f5ac2ee8edf3bc04a7742b2c0dab4afdff
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-19 08:49:47 -0600
Remove top 5 entries since they are now done using the new install
update system
0 54 doc/UPDATING
commit 37cde7f9c41882681540b9df39e2a59e5a89ebbd
Merge: 35627e1 1e8d93d
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-19 08:11:39 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 35627e1ddbe34c405ee353eb341ebb838c9b7ef8
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-19 08:03:59 -0600
Another small fix for lannodes.
0 4 tbsetup/libvtop.pm.in
commit 1e8d93dd39178ccfc081810f506ca944aef39676
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-18 15:51:27 -0600
add libxmlrpc stuff for subboss
1 0 GNUmakefile.in
5852 1671 configure
8 5 configure.in
7 0 tbsetup/GNUmakefile.in
148 0 tbsetup/subboss_frisbeeimage.in
564 0 tbsetup/subboss_frisbeelauncher.in
449 2 xmlrpc/emulabserver.py.in
commit e99c2f4f1e8cc67d5a8ecdc5884be274a273923d
Author: Robert Ricci <ricci@cs.utah.edu>
Date: 2010-06-18 15:47:20 -0600
Bugfix for fixed interfaces.
I now think my last bugfix was incorrect - what we need to change when
the link is flipped is which end we compare, rather than which interface
on the vlink we compare with.
Quite a bear to track down!
13 2 assign/score.cc
commit 769dfc7d2345d442029514864fdd41f247b11341
Author: Robert Ricci <ricci@cs.utah.edu>
Date: 2010-06-18 15:32:50 -0600
Add a handy define to only print the first N score debug messages
10 0 assign/score.cc
commit 638e085397346ef2b56e0c9eff5f1d05e8f6da46
Author: Robert Ricci <ricci@cs.utah.edu>
Date: 2010-06-18 15:24:38 -0600
Bugfix for operator<< when the string is NULL.
5 1 assign/fstring.h
commit 3d63f520a07cf2a920cce5f361cb1768171b78c4
Author: Robert Ricci <ricci@cs.utah.edu>
Date: 2010-06-16 18:08:20 -0600
Fix formatting
5 1 assign/score.cc
commit 33e6d97eddcaefc845a4918823771455353a4518
Author: Robert Ricci <ricci@cs.utah.edu>
Date: 2010-06-16 17:46:22 -0600
Add a bunch of debugging output to track down a fixed interface problem
10 2 assign/score.cc
commit c0c581e4bc6729453adde0e49a8a7bddad1dfcab
Author: Tarun Prabhu <tarunp@myboss.jonlab.testbed.emulab.net>
Date: 2010-06-18 14:04:32 -0600
More code to libvtop to suppose rspec. Nothing specific worth mentioning. Still work to be done though.
6 1 assign/GNUmakefile.in
239 192 tbsetup/libvtop.pm.in
2 1 tbsetup/mapper.in
commit 45f3138a17e7867e4df254c727d817876c09a45f
Merge: be5796c 437c2a8
Author: Jonathon Duerig <duerig@flux.utah.edu>
Date: 2010-06-18 13:58:28 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/users/duerig/emulab-devel
commit be5796cb991ce1b1d4d285563f655eac199a40ef
Merge: d1400a3 3116cef
Author: Jonathon Duerig <duerig@flux.utah.edu>
Date: 2010-06-18 12:54:18 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 3116cefcfb18370c891e4109c9630ed15eb0ea39
Merge: 11e4929 387183b
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-18 12:50:51 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 11e4929c16fa7567227e8bd8707b237636ac84fd
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-18 12:49:47 -0600
Minor change to print statement.
1 1 tbsetup/libvtop.pm.in
commit d1400a3cd8b34a22dfedfca1e2c052209d024db0
Author: Jonathon Duerig <duerig@flux.utah.edu>
Date: 2010-06-18 12:43:53 -0600
Handle mixed start/stop states correctly in CM. Rename component_urns to sliver_urns in interface.
4 4 protogeni/lib/GeniCMV2.pm.in
commit 387183b5015f22c5de9fcfc3735e6fa505ae844f
Merge: a54ab06 02900c5
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-18 09:32:42 -0600
Merge remote branch 'central/master'
commit a54ab062e676c5f4e550b3b36d94ba8ecd1bdbf8
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-18 09:30:32 -0600
Get the "boss IP" from tmccbossinfo() rather than /var/emulab/boot/bossip.
This makes us (closer to) consistent all around and we were populating that
latter file incorrectly anyway! (though it only mattered with the new
sub-boss mechanism.)
3 6 tmcd/linux/libvnode.pm
3 5 tmcd/linux/mkvnode.pl
3 5 tmcd/linux/vnodectl
commit 02900c5e7756dada82017b4aa4838cfea4913113
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-17 16:35:11 -0600
Fix for lan nodes and interswitch links; nodeportA can actually be
null, and nodeportB defined.
19 11 tbsetup/libvtop.pm.in
commit 806597b8f1240aef2cec000d072a8b8579bf662c
Author: Jonathon Duerig <duerig@flux.utah.edu>
Date: 2010-06-17 11:47:48 -0600
Add xercesc as a required package for protogeni.
2 1 protogeni/scripts/initsite.in
commit ede943b0054ba34ed053ec35d15240bf5f2b3dac
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-17 13:06:46 -0400
Fix a SQL syntax bug in database update 214.
7 7 sql/updates/4/214
commit 739557782e47ba565ed573e4772e55b072498536
Author: Gary Wong <gtw@flux.utah.edu>
Date: 2010-06-17 09:32:04 -0600
Revert "Use @WWWHOST@ instead of @BOSSNODE@ in generated certificates."
This reverts commit 0786a006de1ae01f1b6267e7575901abf3baf99e.
1 1 ssl/server.cnf.in
commit 7c169a5872405dc9612720c99eda5d787773b9be
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-10 19:09:31 -0600
add support for subbosses to doloadinfo
40 4 tmcd/tmcd.c
commit f14c93afcb211b436572780bbfcf04b4389234f2
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-05 18:55:03 -0600
Add subboss_images table to database
16 0 sql/database-create.sql
25 0 sql/updates/4/214
commit 5bd99aef7150e2b30069f060b127b84333948a9a
Author: Jonathon Duerig <duerig@boss.emulab.net>
Date: 2010-06-16 15:37:44 -0600
Added support to trivial links to RSpec annotater.
Patch submitted by Tarun.
282 100 assign/annotate_rspec.cc
57 22 assign/annotate_rspec.h
3 3 assign/solution.cc
commit ccf723dc7bd05f267a4a6986bf231e1021455662
Merge: caae3ca 532c001
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-16 11:44:26 -0600
Merge remote branch 'central'
commit caae3ca1153ce5c82562307882e5fcae7dae768c
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-16 11:40:23 -0600
Add new table called emulab_locks, which is a table of name,value
pairs. Used only by the pool daemon, to control concurrency between
the pool daemon and mapper.
6 1 db/dbboot.in
11 0 sql/database-create.sql
1 0 sql/database-fill-supplemental.sql
25 0 sql/updates/4/213
commit 532c001557dbcc3827612cfc12be339bddd8940e
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-15 18:34:57 -0600
add frisbee client/server to subboss
2 1 GNUmakefile.in
10 0 os/GNUmakefile.in
commit 7f2114ad70fa34644b9d193d1aaf28d434d48dce
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-15 17:42:04 -0600
dhcp-related fixes for subbosses
1 0 GNUmakefile.in
3 3 db/dhcpd_makeconf.in
6 3 dhcpd/GNUmakefile.in
commit 5b03dab61b57c68ef7def9c9193cbd6c36318cf8
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-15 15:05:10 -0600
Minor bug fix; make sure failed() returns actual failure status.
2 2 tbsetup/libossetup.pm.in
commit 4434701ad63de6c85a1784f2223824a70fe9a56d
Merge: 3bc1caa bf86d8b
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-15 12:45:07 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 3bc1caa898193063bcc5ba1728419308b6bb28c8
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-15 12:44:42 -0600
Do not put per-type pcvm entries (pcvm850,) into the node_auxtypes
table. Just put the pcvm:count entry in, and have ptopgen generate
the other names. This made it easier to fix ptopgen to subtract the
number of existing VMs on shared nodes.
16 0 sql/updates/4/212
21 5 tbsetup/ptopgen.in
0 6 utils/newnode.in
commit fabe11afda4411ad3309bcd10138d314ea18eed5
Author: Tarun Prabhu <tarunp@flux.utah.edu>
Date: 2010-06-15 12:32:44 -0600
Minor typo in GNUMakefile.in
1 1 protogeni/scripts/GNUmakefile.in
commit 2bba700fd3b2520df6c0d2955e0ab38b7a94726a
Author: Tarun Prabhu <tarunp@flux.utah.edu>
Date: 2010-06-15 12:21:37 -0600
Whoops. Added the .py file instead of .py.in. Fixed that.
0 291 protogeni/scripts/advt-merge.py
297 0 protogeni/scripts/advt-merge.py.in
commit ba47d0c650316d28d6d99c925de241a9a5b9a8a9
Merge: a3df664 bf86d8b
Author: Tarun Prabhu <tarunp@flux.utah.edu>
Date: 2010-06-15 12:08:59 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
Conflicts:
assign/parse_advertisement_rspec.cc
protogeni/scripts/GNUmakefile.in
tbsetup/libvtop.pm.in
commit a3df66494f23bd81d02613115afcdf4147833b2f
Author: Tarun Prabhu <tarunp@flux.utah.edu>
Date: 2010-06-15 11:36:44 -0600
Script to merge multiple advertisements into one.
291 0 protogeni/scripts/advt-merge.py
commit bf86d8b00ab32167f701e9c8e227a9b2a8534ac2
Author: Gary Wong <gtw@flux.utah.edu>
Date: 2010-06-15 10:57:43 -0600
Silence a spurious warning (don't complain about interswitch links
when all links are intraswitch).
Also, if the warning really DOES apply, send it to standard error instead.
2 2 assign/annotate_rspec.cc
commit 6c5a053a6abfb6993086f43c243d67e0b9c9a95a
Author: Robert Ricci <ricci@cs.utah.edu>
Date: 2010-06-14 16:49:28 -0600
Only apply procurve1 hack at Utah
This hack now only applies if TBMAINSITE is set to avoid problems
with other sites that might have a switch with the same name. Added
a little more commenting to jog my memory when I forget why we did
this 2 years down the line.
4 2 tbsetup/ptopgen.in
commit 96518d62b9477f1e32ad1cd4436eb67f9250c053
Merge: beff6c7 e5cecc2
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-14 17:52:32 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit e5cecc22ea9fbd047a9427dbec5b8d664f553497
Merge: 4a35537 db08c39
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-14 17:49:37 -0600
Merge branch 'non-pg-users'
commit 75ff7e45e14fa971bc77949ca8106685436d545b
Author: Tarun Prabhu <tarunp@flux.utah.edu>
Date: 2010-06-14 17:26:01 -0600
A class with helper functions to be used by the rspec parser.
107 0 assign/rspec_parser_helper.cc
45 0 assign/rspec_parser_helper.h
commit beff6c7c36d4368a4f98a66dc4b268d99c2c4264
Merge: 6d54675 4a35537
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-14 16:46:01 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit aba499b37e4143dfd71ddab305b320ebe33b5a06
Author: Tarun Prabhu <tarunp@flux.utah.edu>
Date: 2010-06-14 15:30:54 -0600
Contains a number of changes for handling v1 and v2 of rspecs. V2 is known
to be buggy and support for extensions needs to tested and in some cases,
there's more stuff that needs to go in as extensions.
5 4 assign/assign.cc
117 1 assign/emulab_extensions_parser.cc
85 70 assign/emulab_extensions_parser.h
33 32 assign/parse_advertisement_rspec.cc
1 1 assign/parse_advertisement_rspec.h
35 77 assign/parse_request_rspec.cc
1 2 assign/parse_request_rspec.h
14 5 assign/rspec_parser.cc
4 10 assign/rspec_parser.h
0 9 assign/rspec_parser_v1.cc
0 3 assign/rspec_parser_v1.h
118 17 assign/rspec_parser_v2.cc
23 10 assign/rspec_parser_v2.h
1 0 assign/xmlhelpers.cc
45 20 assign/xmlhelpers.h
715 443 tbsetup/libvtop.pm.in
commit 6d5467573d367f5a7a67536138e6319cb6293b1e
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-14 13:47:07 -0600
Add DBKeyExists() function for use in sql update scripts, to fix
error in protogeni/updates/14
3 2 db/emdb.pm.in
16 1 db/emdbi.pm.in
6 2 protogeni/lib/GeniDB.pm.in
4 2 protogeni/updates/14
commit db08c39235fadb245103e6d37ae2233a3981960b
Merge: f2ea5ac ac6a35f
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-14 10:16:45 -0400
Merge branch 'master' into non-pg-users
commit 4a355379fa0b4c7117f4670ad1cad0aa68688b2b
Merge: 10622ae ac6a35f
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-14 10:16:01 -0400
Merge branch 'master' into geni-am-devel
commit ac6a35f185db4f702c8d57eede94da05a5751362
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-11 15:49:50 -0600
Increase timeouts in other ParRun statements.
3 3 db/libGeni.pm.in
commit 882a3ce30ddaf13bcdea14c396956afb18dfcb1f
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-11 15:48:01 -0600
Double timeout when redeeming tickets. Need a real solution for this.
4 1 db/libGeni.pm.in
commit 437c2a892339a449d398d13b6c0aa61e1f91dab7
Merge: 282e4de 300b49c
Author: Jonathon Duerig <duerig@flux.utah.edu>
Date: 2010-06-11 15:01:31 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/users/duerig/emulab-devel
commit 58d9d43e54d86dff6f43b37207486da979652a3a
Merge: 2d26cca 282e4de
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-11 14:22:29 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 2d26cca70a6e3deded780edd510bb5a0a62c2cef
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-11 14:21:44 -0600
Kill the pool lock; buggy.
1 1 tbsetup/mapper.in
commit c69a3af790606b7df24f224f96d3f6f15867cdd2
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-11 12:58:12 -0600
Fix from Tom Mitchell; move SSLVerifyDepth into server config, since
it is ignored in directory context.
1 2 apache/httpd.conf.in
53 0 install/updates/5/6
commit 8cd12669aeeca09e2fa5cc65701732fb8433bddc
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-11 12:55:56 -0600
Make sure apache and rc.d dirs get built.
Add target to build elabinelab tarball using git archive.
11 2 GNUmakefile.in
commit 282e4ded89515aa2c4011820335d0f64f11b1382
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-11 11:57:31 -0600
sort nodes by node.priority in dodhcpdconf
1 1 tmcd/tmcd.c
commit bf051a084301e2d4c3f4d7764f4d4f483780b8c3
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-11 11:39:32 -0600
Don't install subboss_dhcpd_makeconf on boss
subboss_dhcpd_makeconf was getting installed on boss accidentally. It
also should be in @prefix@/sbin, not @prefix@/bin, so move it there.
7 5 db/GNUmakefile.in
1 1 db/dhcpd_makeconf.in
commit 809fd88bd7b5b9b74dd057cbc9d68eb13f55ae5b
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-11 11:32:28 -0600
Make dhcpd_makeconf restart subboss dhcp servers
When installing and/or restarting a new dhcpd.conf, make sure that
we run the subboss_dhcpd_makeconf script on subbosses as well.
I thought I pushed this before, but apparently I stashed it
and never applied it again. Oops. :-(
23 0 db/dhcpd_makeconf.in
commit f2ea5ac46c33d510f82e006245de184b25cf716b
Merge: 6df6e7b c16ced2
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-11 13:32:55 -0400
Merge branch 'master' into non-pg-users
commit 10622aed8ecbf99f2f3277443442643af5643139
Merge: e862fc4 c16ced2
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-11 13:32:07 -0400
Merge branch 'master' into geni-am-devel
commit c16ced23d07e20c76e489762917d7240b95b0d0c
Merge: e349a63 a742ea9
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-11 11:12:59 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit e349a63c6e6e27409b9c3925b4937c0c2da5d45c
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-11 11:12:20 -0600
Print out URNs instead of hrns when printing protogeni slice info.
8 6 www/experiment_defs.php
17 0 www/geni_defs.php
4 0 www/showslice.php
commit a742ea9d60661632a854f5462bc1d03bfb679fd4
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-10 17:36:48 -0600
Avoid dynamic use (unpacking) of Python M2Crypto .egg file.
The FreeBSD port just installs the zipped .egg file for M2Crypto and there
is no option to make or install an unzipped version. Unfortunately, the
zipped version gets unpacked, per-user when it is first used and the
directory it is unpacked to is not always writable. To avoid unsightly
"permission denied" failures, we run a post-package-install phase to
manually unpack the .egg in the python site-library directory. This is
wicked ugly and I really should be flogged for doing this...
43 2 install/boss-install.in
42 1 install/ops-install.in
commit 17d29399096b7dfad3dda4715ecb30eae7ffb8a8
Author: Jonathon Duerig <duerig@flux.utah.edu>
Date: 2010-06-10 17:16:53 -0600
Fix: Correctly invoke GetAdvertisement with a version number.
1 1 protogeni/lib/GeniCMV2.pm.in
commit ef3a3f6a3faa2f3d0234efee6f9615931086928b
Author: Jonathon Duerig <duerig@flux.utah.edu>
Date: 2010-06-10 16:55:20 -0600
Default rspec in Resolve to 0.1.
We will deal with Resolve versioning issues later.
5 5 protogeni/lib/GeniCM.pm.in
commit 2abec349c89f02a579c99352fcf7b776e55b5186
Author: Jonathon Duerig <duerig@flux.utah.edu>
Date: 2010-06-10 14:14:23 -0600
Fix: Needs to return 0 on success. Fixed inconsistency about whether ofcontroller is a text or int field.
4 3 sql/updates/4/211
commit c8841ba75141ae75b621193ed6d922f657d2803a
Author: Jonathon Duerig <duerig@boss.emulab.net>
Date: 2010-06-10 12:46:42 -0600
Do not add the lan type to Utah's procurve1 switch.
5 1 tbsetup/ptopgen.in
commit 8c3602be3cf3d11457802477eb30ff92808defd1
Merge: 63627ea 6bdac7c
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-10 10:22:10 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 63627eaa69741f03f593cfce7d05f655e7440043
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-10 10:21:31 -0600
Mark as obsolete and unsupported.
3 1 www/tutorial/mobilewireless.php3
commit 6bdac7cab9577ee7e871730dc990b8299f41d7af
Merge: dc0db4d 29c597c
Author: Robert Ricci <ricci@cs.utah.edu>
Date: 2010-06-10 10:19:05 -0600
Merge branch 'ofmerge'
commit dc0db4de5a98a6ab997de51a02d9395b15486cec
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-10 10:13:15 -0600
Kill off NSE and Mobile Wireless from the front page.
1 10 www/index-mainsite.html
commit 56012186466ab7047d1ccff6decc50a3afa8e190
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-10 09:11:22 -0600
Use new os_setup in geni project.
1 1 tbsetup/tbswap.in
commit 6df6e7ba5634284d240e1e85ed8d216fd1b27e95
Merge: d72fb5a 0497781
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-10 08:45:09 -0400
Merge branch 'master' into non-pg-users
commit 29c597cd27326ca569370a90592d7fe8ffdd9f5f
Author: Robert Ricci <ricci@cs.utah.edu>
Date: 2010-06-09 17:19:31 -0600
Add table_regex entries for openflow in the update
7 0 sql/updates/4/211
commit d276254fc1e3918d3cf907e7cb4c88dd6ed52e6f
Author: Robert Ricci <ricci@cs.utah.edu>
Date: 2010-06-09 16:29:42 -0600
DB update script for openflow support
19 0 sql/updates/4/211
commit ce8f5452bea01cae212d12d4802c85e74149a232
Merge: 0497781 4275b38
Author: Robert Ricci <ricci@cs.utah.edu>
Date: 2010-06-09 16:00:05 -0600
Merge remote branch 'weibin/ofbranch' into ofmerge
Merge of Weibin's openflow work, which allows users to request openflow
in their NS files.
Conflicts:
sql/database-create.sql
sql/database-fill.sql
tbsetup/ns2ir/lanlink.tcl
commit 04977815f8d5db8bec9374eef8533e077a37be0b
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-09 15:49:33 -0600
Minor bug fixes to hrn regex.
4 2 protogeni/lib/GeniCredential.pm.in
6 4 protogeni/lib/GeniTicket.pm.in
commit b6ac7dbb450b3bd7c377453c909f476246a5b8e0
Merge: 5f812b5 9b7960a
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-09 13:39:34 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 5f812b5eb66b79dfa16a22c6b122888141b707fa
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-09 13:39:07 -0600
More bug fixes for cooked mode.
10 5 db/libGeni.pm.in
commit 9b7960a2b52e344efd4fe07fe63df7a8d1207a6f
Author: Ryan Jackson <rdjackso@cs.utah.edu>
Date: 2010-06-09 11:35:15 -0600
Fix broken default makefile target
I broke the default target in db when committing my subboss changes.
This should restore it to 'all'.
2 2 db/GNUmakefile.in
commit af6a7133de0dbcc1fd1e2ab753e2b5da76d8582e
Merge: 5205081 3d26e96
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-09 11:08:41 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 3d26e961bad0767ff430881a30e71a4eb90f793e
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-09 11:05:22 -0600
Minot bug fix.
2 2 protogeni/test/jailtest.rspec
commit d9c50e2f44acc8e72f7d1bd30c8c3817fbba23db
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-09 11:05:07 -0600
More trashy rspec conversion bug fixes.
72 53 protogeni/lib/GeniResource.pm.in
commit 5205081bc44a2946bded639c243cc4fb85c57776
Merge: dd4495d b1883be
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-09 10:32:25 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit b1883be76002db4f80b4f1219b0db9bd0aedf8e0
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-09 10:18:18 -0600
Fix Geni inclusion for non-protogeni sites.
6 1 tbsetup/libossetup.pm.in
0 1 tbsetup/os_setup_new.in
commit dd4495d6e69a48a5610cc12496dc3e2e605bca0d
Merge: f4582fe b4547d1
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-09 08:27:22 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit b4547d11fe6a50c44eecaf3274382511dd5c7d4d
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-09 08:17:27 -0600
Add <services><login> section to tell user how to login.
11 2 protogeni/lib/GeniSliver.pm.in
commit d72fb5af390659eb49df69c18e35a66b3d800a90
Merge: 774c4e1 dfb4e67
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-09 08:06:58 -0400
Merge branch 'master' into non-pg-users
commit f4582febe779836a4385dd62490a1d3ef4abd3fe
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-08 15:36:55 -0600
Squash more bugs in rspec conversion. This conversion utility will
have to be shelved soon.
8 0 protogeni/lib/GeniResource.pm.in
commit dfb4e67133b12f173469c443a1ac9a9395a93d5f
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-08 14:44:29 -0600
Bug fix to my trashy rspec conversion utility.
1 0 protogeni/lib/GeniResource.pm.in
commit cd3a9ba49910b35f9c6aa81cf0929122f8aa78d0
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-08 12:03:46 -0600
Commit Tarun's argument processing fixes.
13 6 assign/assign.cc
commit 8f8b8b9479dd579b79c4ffa3fc1346e9d1e75e58
Merge: 4f83dfa 9d45ca7
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-08 11:41:05 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 9d45ca7e87a516f7a75b35edc5251ee46eecb4c9
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-08 11:19:27 -0600
Turn on new version of os_setup for testbed project.
5 2 tbsetup/tbswap.in
commit 3825b5f561bbddba877ad8cc198ad1dc7107641b
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-08 11:19:08 -0600
Add another convenience CNAME for inner elab, for event-server.
7 0 tbsetup/named_setup.in
commit 4f83dfac5da67907d169fb1393e1ec1e3b0971ee
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-08 11:18:11 -0600
When startsliver fails, be sure to send a TBFAILED event for the nodes
in the sliver so that os_setup does not wait until timeout. Also some
bug fixes and cleanup all through start/wait for sliver.
52 9 db/libGeni.pm.in
commit f89ada852429ae517f43372e61ae7a2c26d59ad6
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-08 11:16:40 -0600
Minor bug fix.
1 1 tbsetup/libossetup.pm.in
commit 783e38fd9d0a5e8bdb336262d3dfaff7a7cbc0d2
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-08 11:16:26 -0600
Make sure we set an sshd port on sharednodes.
2 1 tbsetup/libvtop.pm.in
commit ad5486071564a4f3841dab3fb46aacd619d82650
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-08 11:15:55 -0600
Minor bug fix.
3 4 www/menu.php3
commit a0c630825fc6fd2a96722ee349c5ed6fadda4c61
Merge: 9edc275 6b65cda
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-07 15:21:31 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 6b65cda3b9afd5baae0cd39c29c8860c456b33a4
Merge: 8e8a510 c030076
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-07 15:20:54 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 8e8a510905b379086df89334f9d2f57bf47ef414
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-07 15:20:34 -0600
Always return sshdport for VMs.
1 2 protogeni/lib/GeniSliver.pm.in
commit c030076f340b0fccb6e31e4297470863670f8ff2
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-07 14:48:04 -0600
Update to reflect changes of the last 6 years.
Probably still not complete, but closer.
111 26 event/API
commit 9edc2757de425d4d3d253634908f5652f00a0c71
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-07 13:03:18 -0600
Add simple locking between the pool daemon and the mapper so
that the pool daemon does not run while the mapper is working.
This will only affect experiments that are using shared nodes
though, since the lock is way too coarse and basically serializes
the mapper. Since very experiments use hared nodes at this time, it
will not really be a problem.
Also added TERM handling to avoid killing the daemon while its
working, as when stopping testbed daemons to update the installation.
30 1 tbsetup/mapper.in
53 19 tbsetup/pool_daemon.in
commit 9d051c7caadf8de8b9eb60e43f8bdb3571887610
Merge: 5e8d175 3534c16
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-07 11:46:05 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 5e8d175c92fd22db72fb887e55547fea9a5508c6
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-07 11:45:42 -0600
Minor bug fix.
6 1 backend/moduserinfo.in
commit 774c4e1fd45f2e2f3995c2d13aa4a93dd8e91be4
Merge: 6e6057d 3534c16
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-07 08:40:40 -0400
Merge branch 'master' into non-pg-users
commit 3534c16dd7aa40c8b580d819e0b18f64b23ecdbf
Merge: be7f610 81a5b97
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-04 17:34:33 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit be7f6105e7e251ef80bde982e256ef4838aa753b
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-04 17:27:32 -0600
Initialize the version_info table by looking at the highest numbered
update file in each of the sql and install update dirs.
40 3 install/boss-install.in
0 1 install/fs-install.in
16 5 install/libinstall.pm.in
0 2 install/ops-install.in
commit 81a5b97faec95a659b9ed7abc23dc3937b7136fd
Merge: bc2426d 157d380
Author: Jonathon Duerig <duerig@boss.emulab.net>
Date: 2010-06-04 14:33:16 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit bc2426dda80c1bcd270c4884d2e31afec1a7e8f2
Author: Jonathon Duerig <duerig@boss.emulab.net>
Date: 2010-06-04 14:32:23 -0600
Modify ptopgen to allow for an undefined iface value in the interfaces table.
8 7 tbsetup/ptopgen.in
commit 157d3802eeddf7d7dda8a9c3465527bde9c66e83
Merge: 7ba2439 1e048fc
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-04 11:38:21 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 7ba2439139e3b2b4fe6525e4fed0125c4ca2bf23
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-04 11:37:32 -0600
Exit gracefully if hash cannot be determined.
8 3 utils/setbuildinfo.in
commit 1e048fcffc4bdbc7ba8dbaff5e838432de28642e
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-04 10:33:11 -0600
Checkpoint on going update.
52 20 event/API
commit 6e6057d30ba60ae9732dfeda8eebc63486dd362e
Merge: f58ffd2 e051528
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-04 11:33:21 -0400
Merge branch 'master' into non-pg-users
commit e051528327de116d5d19f6b74c2ebeaa91e78113
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-04 09:03:23 -0600
Add many many more backslashes!
1 1 sql/updates/4/210
commit f5bb9f920ed710d31c2061ad237949570b4615f5
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-04 08:57:31 -0600
Some harmless protogeni stuff.
5 1 install/boss-install.in
commit e6e2aeeeb08a26bbcf4927c9bae7b8304071c28c
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-04 08:53:16 -0600
Add changes reflected in install/updates/5/5
8 2 install/boss-install.in
commit 4a3a0aeb094fd092e99f7b912c5419588085fc31
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-04 08:47:23 -0600
Gack, another bug fix.
1 1 sql/updates/4/210
commit 0c9a715a46bf885a2927068df6e9fabba1e96e68
Merge: cf0ae22 24e8b2f
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-04 08:01:15 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit cf0ae227072228977ead0d75b0fab2faf647a7a7
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-04 08:00:28 -0600
Fix syntax error.
1 1 sql/updates/4/210
commit f58ffd2b2966718852cc1ef6d715f8f66b549136
Merge: 9d4fc9f 24e8b2f
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-04 09:26:05 -0400
Merge branch 'master' into non-pg-users
commit 24e8b2f53de6b24723a4ea0585304f6bce80b2fd
Author: Mike Hibler <hibler@cs.utah.edu>
Date: 2010-06-03 17:35:59 -0600
More work to get update scripts working on a fresh install.
17 4 install/update-testbed.in
commit 9d4fc9fda8b087ed16373517df9d71c1254efba6
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-03 17:44:24 -0400
Add urn lookup to Credential2SliceAggregate.
Non-ProtoGENI certs/creds do not contain a UUID, so slices must be
resolved by URN. Added a URN lookup and if that fails, fall back to UUID.
10 1 protogeni/lib/GeniCMV2.pm.in
commit c1ad1734daff7f4b7a130da3c323308d4cbf6c31
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-03 17:37:39 -0400
Add compatibility with PlanetLab style certificates.
PlanetLab certs have a URN but no UUID or HRN. If an HRN is not
encoded in the DN, make one out of the URN. If the UUID is not in the
CN, invent a new one so that the user and cert records in the database
can be linked.
15 0 protogeni/lib/GeniCertificate.pm.in
commit 541d56bc36b6e8138955cf63ea7861a7c1fefeb3
Author: Kevin Atkinson <kevina@flux.utah.edu>
Date: 2010-06-03 14:33:17 -0600
Bug Fix.
Got comparison backwards when checking file date against
HTTP_IF_MODIFIED_SINCE in fetch-vis.
1 1 collab/exp-vis/fetch-vis.in
commit 07f727cbf3f813d1b4e79b0cf13101237dee04dc
Merge: 958fc09 2e615cf
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-03 10:53:52 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 958fc09da821433ca692db22559034bf8d81b29a
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-03 10:52:11 -0600
Add more MLE support. Here is a sample NS file that demonstrates the
new code. Note that this commit implements only the frontend part.
set n1 [$ns node]
set n2 [$ns node]
set n3 [$ns node]
set seg1 [$ns duplex-link $n1 $n2 * 0ms DropTail]
set seg2 [$ns duplex-link $n2 $n3 * 0ms DropTail]
tb-set-link-layer $seg1 1
tb-set-link-layer $seg2 1
set mypath [$ns make-path "seg1 seg2"]
set link0 [$ns duplex-link $n1 $n3 * 0ms DropTail]
$link0 implemented_by $mypath
1 0 db/Experiment.pm.in
6 0 db/VirtExperiment.pm.in
6 3 db/xmlconvert.in
21 0 sql/database-create.sql
9 1 sql/database-fill.sql
63 0 sql/updates/4/210
2 2 tbsetup/ns2ir/GNUmakefile.in
44 1 tbsetup/ns2ir/lanlink.tcl
6 0 tbsetup/ns2ir/nstb_compat.tcl
1 0 tbsetup/ns2ir/parse.tcl.in
50 0 tbsetup/ns2ir/path.tcl
27 0 tbsetup/ns2ir/sim.tcl.in
commit 2e615cf8b67590d56c355d3d7a07713a0c15d2b6
Merge: ea198e0 0420698
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-03 09:27:08 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit ea198e0ad0949fb4c2fd147c5a998e8ad87b667c
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-03 09:26:38 -0600
Add missing files in install directory.
1 0 configure
1 0 configure.in
commit 9339a13d32d4cad5c3f079e785e431aee4e73954
Merge: 58f7e3f 0420698
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-03 11:18:50 -0400
Merge branch 'master' into non-pg-users
commit 0420698277eb3b1e9e36ff6411853298c0f71904
Merge: 53025de d4e145e
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-02 12:44:20 -0600
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
commit 53025de54282793d866c6480b00f384ff5cf70f1
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-02 12:40:35 -0600
A few little bug fixes, which came uo during elabinelab and shared
node testing.
Also stub in the subnode support; should work as well as it did in the
original version of os_setup, since subnodes were always ignored.
46 4 tbsetup/libossetup.pm.in
5 0 tbsetup/os_setup_new.in
commit d4e145e7b1779ddaf3728c1a6929ee3f7de16d52
Author: Leigh B Stoller <stoller@flux.utah.edu>
Date: 2010-06-02 11:30:51 -0600
Minor bug fix.
7 2 www/showstats.php3
commit 58f7e3f0e0bfd81ac55b386715572ef5d537a946
Merge: e862fc4 16e82f6
Author: Tom Mitchell <tmitchell@bbn.com>
Date: 2010-06-01 10:24:22 -0400
Merge branch 'master' into non-pg-users
]]>
