~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: John Arbash Meinel
  • Date: 2011-02-10 01:57:32 UTC
  • mfrom: (425 trunk)
  • mto: This revision was merged to the branch mainline in revision 426.
  • Revision ID: john@arbash-meinel.com-20110210015732-b3kkt1jp7bsqcv0v
Merge loggerhead trunk back into load-test to resolve
__init__.py conflicts from Jelmer's update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
8
8
        rm -rf dist/
9
9
 
10
10
check:
11
 
        BZR_PLUGINS_AT=loggerhead@$$(pwd) bzr selftest -s bp.loggerhead
 
11
        # XXX MichaelHudson 2007-10-29 bug=158361: We can't run the loggerhead
 
12
        # tests in PQM yet :(