Merge lp:~nataliabidart/magicicada-server/fix-pg-host into lp:magicicada-server

[Natalia Bidart]

- During test, start-db after sourcedeps were run (otherwise django is not available).

[Natalia Bidart (nataliabidart)]

Trivial.

review: Approve

=== modified file '.travis.yml'
--- .travis.yml	2016-08-31 22:04:43 +0000
+++ .travis.yml	2016-09-01 18:29:48 +0000
@@ -10,5 +10,4 @@
 
 script:
     - make clean-sourcedeps
-    - make start-db
     - make test SOURCEDEPS_DIR=sourcedeps

=== modified file 'Makefile'
--- Makefile	2016-08-31 22:38:34 +0000
+++ Makefile	2016-09-01 18:29:48 +0000
@@ -111,7 +111,7 @@
 raw-test:
 	./test $(TESTFLAGS)
 
-test: lint sourcedeps clean version start-base start-dbus raw-test stop
+test: lint sourcedeps clean version start-db start-base start-dbus raw-test stop
 
 ci-test:
 	$(MAKE) test TESTFLAGS="-1 $(TESTFLAGS)"

=== modified file 'config-manager.txt'
--- config-manager.txt	2016-08-30 00:50:31 +0000
+++ config-manager.txt	2016-09-01 18:29:48 +0000
@@ -29,5 +29,5 @@
 ./.sourcecode/requests                    ~ubuntuone-pqm-team/requests/stable;revno=816
 ./.sourcecode/requests_oauthlib           ~ubuntuone-pqm-team/requests-oauthlib/stable;revno=16
 ./.sourcecode/u1sync                      ~facundo/u1sync/opensourcing;revno=10
-./.sourcecode/magicicada-client           ~chicharreros/magicicada-client/trunk
-./.sourcecode/magicicada-protocol         ~chicharreros/magicicada-protocol/trunk
+./.sourcecode/magicicada-client           ~chicharreros/magicicada-client/trunk;revno=1429
+./.sourcecode/magicicada-protocol         ~chicharreros/magicicada-protocol/trunk;revno=166