MAAS

Code review comment for ~deadlight/maas:commission-actions

  1. Git
  2. lp:~deadlight/maas
  3. commission-actions
  4. Merge into master
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Looks like this one will need to be rebased from msater and have its CSS rebuilt before it can land. According to the lander:

+ git merge --squash source/commission-actions
Auto-merging src/maasserver/static/partials/node-details.html
Auto-merging src/maasserver/static/css/build.css
CONFLICT (content): Merge conflict in src/maasserver/static/css/build.css
Squash commit -- not updating HEAD
Automatic merge failed; fix conflicts and then commit the result.

« Back to merge proposal