← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~rvb/maas/maas-hacking into lp:maas

 

Raphaël Badin has proposed merging lp:~rvb/maas/maas-hacking into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/maas-hacking/+merge/92441

This branch updates the HACKING.txt document:
- the postgresql-dev package in now libpq-dev (in precise)
- I've updated the HACKING.txt document so that if you run all the shell commands you will have a working maas server.
- drive-by fix: update the API doc page to work with Huw's recent design work.

-- 
https://code.launchpad.net/~rvb/maas/maas-hacking/+merge/92441
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/maas-hacking into lp:maas.
=== modified file 'HACKING.txt'
--- HACKING.txt	2012-01-30 12:20:27 +0000
+++ HACKING.txt	2012-02-10 11:15:07 +0000
@@ -24,7 +24,14 @@
 Prerequisites
 =============
 You will need to manually install Postgres 9.1 (postgresql-9.1 and
-postgresql-dev), RabbitMQ (rabbitmq-server) and python-dev.
+libpq-dev), RabbitMQ (rabbitmq-server), python-dev and make::
+
+    $ sudo apt-get install postgresql-9.1 libpq-dev rabbitmq-server python-dev make
+
+Also, you might want to install Bazaar (bzr) to grab the source code directly
+from Launchpad::
+
+    $ sudo apt-get install bzr
 
 All other development dependencies are pulled automatically from `PyPI`_
 when buildout runs.
@@ -33,6 +40,15 @@
   http://pypi.python.org/
 
 
+Getting the lastest version of the code
+=======================================
+
+You can grab the code manually from Launchpad but Bazaar makes it easy to fetch
+the last version of the code. Go into the directory where you want the code
+to reside and run::
+
+    $ bzr branch lp:maas maas && cd maas
+
 Development MaaS server setup
 =============================
 

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2012-02-10 08:49:01 +0000
+++ src/maasserver/api.py	2012-02-10 11:15:07 +0000
@@ -382,7 +382,7 @@
         generate_doc(NodeMacHandler),
         )
 
-    messages = ['MaaS API\n========\n\n']
+    messages = []
     for doc in docs:
         for method in doc.get_methods():
             messages.append(

=== modified file 'src/maasserver/templates/maasserver/api_doc.html'
--- src/maasserver/templates/maasserver/api_doc.html	2012-01-27 18:06:49 +0000
+++ src/maasserver/templates/maasserver/api_doc.html	2012-02-10 11:15:07 +0000
@@ -1,5 +1,8 @@
 {% extends "maasserver/base.html" %}
 
+{% block title %}MaaS API documentation{% endblock %}
+{% block page-title %}MaaS API documentation{% endblock %}
+
 {% block content %}
   {{ doc|safe }}
 {% endblock %}