From: root <root@cassidy.cs.princeton.edu>
Date: Mon, 21 Mar 2011 22:15:56 +0000 (-0400)
Subject: Merge commit 'origin/master'
X-Git-Tag: plcapi-5.0-33~15
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=62a9da548fbef4c3c23eb9b304d6a78a35201c5a;hp=295eb745592e486442587145ab1efcb15e7c9b82;p=plcapi.git

Merge commit 'origin/master'
---

diff --git a/PLC/Accessors/Accessors_standard.py b/PLC/Accessors/Accessors_standard.py
index 8b81734..0867515 100644
--- a/PLC/Accessors/Accessors_standard.py
+++ b/PLC/Accessors/Accessors_standard.py
@@ -27,8 +27,8 @@ define_accessors(current_module, Slice, "Vref", "vref",
                  set_roles=["admin","pi","user","node"], expose_in_api=True)
 # this contains the actual script text
 # if set, it supersedes 'initscript'
-define_accessors(current_module, Slice, "InitscriptBody","initscript_body",
-                 "slice/usertools", "Slice initialization script body",
+define_accessors(current_module, Slice, "InitscriptCode","initscript_code",
+                 "slice/usertools", "Slice initialization script code",
                  set_roles=["admin","pi","user"], expose_in_api=True)
 # this may contain a *name* that refers to the GetInitScripts
 # it was initially designed to share scripts among slices
diff --git a/planetlab5.sql b/planetlab5.sql
index 4083039..95eb02b 100644
--- a/planetlab5.sql
+++ b/planetlab5.sql
@@ -840,7 +840,7 @@ CREATE TABLE initscripts (
     initscript_id serial PRIMARY KEY,			-- Initscript identifier
     name text NOT NULL,					-- Initscript name
     enabled bool NOT NULL DEFAULT true,			-- Initscript is active
-    script text NOT NULL,				-- Initscript body
+    script text NOT NULL,				-- Initscript code
     UNIQUE (name)
 ) WITH OIDS;
 CREATE INDEX initscripts_name_idx ON initscripts (name);