← Back to branch summary

~ubuntu-branches/ubuntu/vivid/heat/vivid

« back to all changes in this revision

Viewing changes to heat/engine/stack_user.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Corey Bryant
  • Date: 2015-01-06 08:55:22 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20150106085522-4o3hnaff5lacvtrf
Tags: 2015.1~b1-0ubuntu1
[ Chuck Short ]
* Open up for vivid.
* debian/control: Update bzr branch. 
* debian/control: Add python-saharaclient,
  python-osprofiler, python-oslo.middleware, python-oslo.serialization.
* debian/patches/fix-reqirements.patch: Refreshed.
* debian/patches/skip-tests.patch: Updated to skip more tests.
* debian/rules: Skip integration tests.

[ Corey Bryant ]
* New upstream release.
  - d/control: Align requirements with upstream.
  - d/watch: Update uversionmangle for kilo beta naming.
  - d/rules: Generate heat.conf.sample and apply patch before copy.
  - d/rules: Run base tests instead of integration tests.
  - d/p/fix-requirements.patch: Refreshed.
  - d/p/remove-gettextutils-import.patch: Cherry picked from master.
* d/control: Bumped Standards-Version to 3.9.6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/engine/stack_user.py
15
15
 
16
16
from heat.common import exception
17
17
from heat.common.i18n import _
 
18
from heat.common.i18n import _LW
18
19
from heat.engine import resource
19
20
from heat.openstack.common import log as logging
20
21
 
95
96
            # compatibility with resources created before the migration
96
97
            # to stack_user.StackUser domain users.  After an appropriate
97
98
            # transitional period, this should be removed.
98
 
            LOG.warning(_('Reverting to legacy user delete path'))
 
99
            LOG.warn(_LW('Reverting to legacy user delete path'))
99
100
            try:
100
101
                self.keystone().delete_stack_user(user_id)
101
102
            except kc_exception.NotFound: