All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 776f0e8a authored by Leigh B Stoller's avatar Leigh B Stoller

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

parents e70d79c6 2b2f70c8
...@@ -10,8 +10,17 @@ sub DoUpdate($$$) ...@@ -10,8 +10,17 @@ sub DoUpdate($$$)
DBSetDefault($dbhandle); DBSetDefault($dbhandle);
#
# This is a fixup.
#
if (DBKeyExists("geni_authorities", "urn")) {
DBQueryFatal("ALTER TABLE `geni_authorities` drop key `urn`");
}
DBQueryFatal("ALTER TABLE `geni_authorities` " .
"add unique key `urn` (`urn`(255))");
DBQueryFatal( "ALTER TABLE `geni_authorities` " . DBQueryFatal( "ALTER TABLE `geni_authorities` " .
"MODIFY `type` enum( 'sa', 'ma', 'ch', 'cm', 'ses', 'am' ) " . "MODIFY `type` enum( 'sa', 'ma', 'ch', 'cm', 'ses', 'am' ) ".
"NOT NULL DEFAULT 'sa'" ); "NOT NULL DEFAULT 'sa'" );
return 0; return 0;
......
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