Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
d212d315
Commit
d212d315
authored
Jul 22, 2011
by
Gabriel Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote branch 'origin/master' into slave_instance
parents
e165743c
a3361773
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
26 deletions
+13
-26
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_jauks_theme/login_form.xml
...emplateItem/portal_skins/vifib_jauks_theme/login_form.xml
+7
-24
master/bt5/vifib_web/bt/revision
master/bt5/vifib_web/bt/revision
+1
-1
slapos/format.py
slapos/format.py
+5
-1
No files found.
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_jauks_theme/login_form.xml
View file @
d212d315
...
@@ -91,31 +91,14 @@
...
@@ -91,31 +91,14 @@
<div
class=
"field forgotten_password"
>
\n
<div
class=
"field forgotten_password"
>
\n
<label>
</label>
\n
<label>
</label>
\n
<div
class=
"field nolabel validate widthAuto"
title=
""
>
\n
<div
class=
"field nolabel validate widthAuto"
title=
""
>
\n
\n
<label>
Join
</label>
\n
<label>
\n
<a
href=
"ERP5Site_viewCredentialRequestForm"
>
Join
</a>
\n
Join\n
</div>
\n
\n
<div
class=
"field nolabel cancel widthAuto"
title=
""
>
\n
\n
<label>
Lost password?
</label>
\n
</label>
\n
<a
href=
"ERP5Site_viewCredentialRecoveryLoginDialog"
>
Lost password?
</a>
\n
<div
class=
"input"
><input
class=
"nolabel validate widthAuto"
src=
""
name=
"ERP5Site_viewCredentialRequestForm:method"
value=
"Join"
type=
"submit"
/></div>
\n
\n
\n
\n
</div>
\n
</div>
\n
<div
class=
"field nolabel cancel widthAuto"
title=
""
>
\n
\n
\n
<label>
\n
Lost password?\n
\n
\n
</label>
\n
<div
class=
"input"
><input
class=
"nolabel cancel widthAuto"
src=
""
name=
"ERP5Site_viewCredentialRecoveryLoginDialog:method"
value=
"Lost password?"
type=
"submit"
/></div>
\n
\n
\n
\n
</div>
\n
</div>
\n
</div>
\n
</fieldset>
\n
</fieldset>
\n
<script
type=
"text/javascript"
>
setFocus()
</script>
\n
<script
type=
"text/javascript"
>
setFocus()
</script>
\n
<p
i18n:translate=
""
i18n:domain=
"ui"
>
Having trouble logging in? Make sure to enable cookies in your web browser.
</p>
\n
<p
i18n:translate=
""
i18n:domain=
"ui"
>
Having trouble logging in? Make sure to enable cookies in your web browser.
</p>
\n
...
...
master/bt5/vifib_web/bt/revision
View file @
d212d315
297
298
\ No newline at end of file
\ No newline at end of file
slapos/format.py
View file @
d212d315
...
@@ -209,7 +209,11 @@ class Computer:
...
@@ -209,7 +209,11 @@ class Computer:
if
address_dict
[
'addr'
]
not
in
computer_partition_address_list
:
if
address_dict
[
'addr'
]
not
in
computer_partition_address_list
:
return
address_dict
return
address_dict
return
None
# all addresses on interface are for partition, so lets add new one
computer_tap
=
Tap
(
'compdummy'
)
computer_tap
.
createWithOwner
(
'root'
,
attach_to_tap
=
True
)
self
.
bridge
.
addTap
(
computer_tap
)
return
self
.
bridge
.
addAddr
()
def
send
(
self
,
config
):
def
send
(
self
,
config
):
"""
"""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment