Merge lp://staging/~nataliabidart/magicicada-server/no-more-storms-0 into lp://staging/magicicada-server
Proposed by
Natalia Bidart
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart |
| Approved revision: | 46 |
| Merged at revision: | 47 |
| Proposed branch: | lp://staging/~nataliabidart/magicicada-server/no-more-storms-0 |
| Merge into: | lp://staging/magicicada-server |
| Diff against target: |
327 lines (+45/-191) 7 files modified
Makefile (+4/-16) Makefile.db (+37/-0) src/backends/db/scripts/dev/init-postgres.sh (+0/-61) src/backends/db/scripts/dev/start-database.sh (+0/-72) src/backends/db/scripts/dev/start-postgres.py (+1/-1) src/backends/db/scripts/dev/stop-database.sh (+0/-39) src/magicicada/settings/__init__.py (+3/-2) |
| To merge this branch: | bzr merge lp://staging/~nataliabidart/magicicada-server/no-more-storms-0 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Facundo Batista | Approve | ||
|
Review via email:
|
|||
Commit message
- Replace postgresql scripts with Makefile rules.
Description of the change
This branch accomplish two things:
- initial cleanup on src/ code when it comes to DB (and system) setup
- allows for running more than one branch simultaneously in the same host, by exporting the PG_HOST env variable.
For example:
$ export PG_HOST=
$ make test
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Awesome!