~allenap/maas/regiond-bind-on-all-interfaces

« back to all changes in this revision

Viewing changes to src/maasserver/api/maas.py

  • Committer: Gavin Panella
  • Date: 2015-04-17 08:11:53 UTC
  • mfrom: (3503.2.322 maas)
  • Revision ID: gavin.panella@canonical.com-20150417081153-zdygntehm3o8vnr9
Merge trunk, resolving lots of conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
from maasserver.api.support import (
23
23
    operation,
24
24
    OperationsHandler,
25
 
    )
 
25
)
26
26
from maasserver.api.utils import get_mandatory_param
27
27
from maasserver.exceptions import MAASAPIValidationError
28
28
from maasserver.forms_settings import (
29
29
    get_config_doc,
30
30
    get_config_form,
31
31
    validate_config_name,
32
 
    )
 
32
)
33
33
from maasserver.models import Config
34
34
from piston.utils import rc
35
35
import simplejson as json