summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-10-26 11:06:01 +0100
committerSimon MacMullen <simon@rabbitmq.com>2010-10-26 11:06:01 +0100
commit5180e6689a568d0ce1678114c905165fbf4f4d9c (patch)
tree7cbcb5f50aea056730889d29d9d3a5bb945174cd
parent3d59a81d259bb705449add31a2246445af598053 (diff)
downloadrabbitmq-server-5180e6689a568d0ce1678114c905165fbf4f4d9c.tar.gz
Remove hack
-rw-r--r--src/rabbit_upgrade_functions.erl10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/rabbit_upgrade_functions.erl b/src/rabbit_upgrade_functions.erl
index 75e4cf88..d4add455 100644
--- a/src/rabbit_upgrade_functions.erl
+++ b/src/rabbit_upgrade_functions.erl
@@ -40,10 +40,6 @@
%%--------------------------------------------------------------------
-%% TODO this is just a hack, when branch bug23319 is merged this should use
-%% the real permission record
--record(permission2, {configure, write, read}).
-
remove_user_scope() ->
{atomic, ok} = mnesia:transform_table(
rabbit_user_permission,
@@ -51,9 +47,9 @@ remove_user_scope() ->
permission = {permission,
_Scope, Conf, Write, Read}}) ->
Perm#user_permission{
- permission = #permission2{configure = Conf,
- write = Write,
- read = Read}}
+ permission = #permission{configure = Conf,
+ write = Write,
+ read = Read}}
end,
record_info(fields, user_permission)),
ok.