Skip to content

Commit 8c6fffa

Browse files
author
Morgan Patch
committed
Merge osuosl#99 into develop.
2 parents 024217e + 454927e commit 8c6fffa

File tree

5 files changed

+21
-8
lines changed

5 files changed

+21
-8
lines changed

docs/source/deployment/intro.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ Make sure you've already checked out :ref:`initializing`.
2020

2121
If you are just testing |gwm| out, run::
2222

23-
$ django-admin.py runserver
23+
$ django-admin.py runserver --insecure
2424

2525
Then open a web browser, and navigate to `http://localhost:8000`.
2626

2727
If you want this to be accessable from a machine other than where you ran that
2828
command, then run the following::
2929

30-
$ django-admin.py runserver 0.0.0.0:8000
30+
$ django-admin.py runserver 0.0.0.0:8000 --insecure
3131

3232
.. Note:: This should only be used to *test*. This should never be used in a
3333
*production* environment.

docs/source/dev/issues.rst

+13
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,19 @@ The issue tracker for |gwm| is on `Github`_. All bugs and feature requests for |
1010

1111
Please follow this guide when filing new issues for Ganeti Web Manager.
1212

13+
Description
14+
-----------
15+
16+
When submitting an issue, the description should generally include the following:
17+
18+
* Exactly what the submitter did to encounter the situation
19+
* What the submitter expected to happen
20+
* What actually happened
21+
22+
Depending on the issue, knowing details about the operating system or web browser being used may be helpful.
23+
24+
In addition to these points, bug reports should also include any relevant information with regard to attempted fixes or workarounds as well as any other effects the bug may have on the software. Any patches which resolve or work around bugs are also appreciated, if only to help developers understand the scope of the bug.
25+
1326
Trackers
1427
--------
1528

ganeti_webmgr/ganetiviz/static/js/graph-abstract-modelling.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
function buildabstractgraph(){
1010

1111
syscenter = {x:500,y:500} // Center of the whole System
12-
pp = polypointscircle(syscenter,200,5)
12+
pp = polypointscircle(syscenter,200,gnodes_json.length)
1313

1414
window.CytoNodeList = [] // A list of node objects in a format required by Cytoscape JS will be added to this list.
1515
window.CytoEdgeList = [] // A list of edge objects in a format required by Cytoscape JS will be added to this list.

ganeti_webmgr/static/css/base.css

+4-4
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ pre.error {
9595

9696
#body_wrapper {
9797
min-height: 100%; /* Sticky footer */
98-
width:979px;
98+
width:980px;
9999
margin:0 auto;
100100
}
101101

@@ -120,7 +120,7 @@ pre.error {
120120
#logo {display:block; margin-left:145px;}
121121

122122
#content_wrapper {background:#eee; width:100%;}
123-
#content_column {margin: 0 auto; width:979px;}
123+
#content_column {margin: 0 auto; width:980px;}
124124
#content {
125125
background:white;
126126
border-left: 1px solid #DDDDDD;
@@ -224,7 +224,7 @@ pre.error {
224224
position:relative; /* Sticky Footer */
225225
padding: 5px 0 0 0;
226226
text-align: center;
227-
min-width:979px;
227+
min-width:980px;
228228
width: 100%;
229229
}
230230
#footer a {color:#C16328;}
@@ -440,4 +440,4 @@ div.delete, div.edit {
440440
p.view_notes {
441441
margin-bottom: 5px;
442442
white-space: pre-wrap;
443-
}
443+
}

scripts/setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ if [ $no_dependencies -eq 0 ]; then
232232

233233
# debian based && mysql
234234
elif [ \( "$os" == "ubuntu" -o "$os" == "debian" \) -a "$database_server" == "mysql" ]; then
235-
database_requirements='libmysqlclient18 libmysqlclient-dev'
235+
database_requirements='libmysqlclient20'
236236

237237
# RHEL based && postgresql
238238
elif [ \( "$os" == "centos" \) -a "$database_server" == "postgresql" ]; then

0 commit comments

Comments
 (0)