Merge pull request #53284 from juju-solutions/bug/import-render

Automatic merge from submit-queue (batch tested with PRs 51765, 53053, 52771, 52860, 53284). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix failing import in juju master namespace actions.

**What this PR does / why we need it**: The import of the templating render method is failing.This is to address this issue.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-10-03 09:02:42 -07:00 committed by GitHub
commit de2aec31d9
2 changed files with 2 additions and 2 deletions

View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from charms.templating.jinja2 import render
from charmhelpers.core.templating import render
from charms.reactive import is_state
from charmhelpers.core.hookenv import action_get
from charmhelpers.core.hookenv import action_set

View File

@ -7,7 +7,7 @@ from charmhelpers.core.hookenv import (
action_fail,
action_name
)
from charms.templating.jinja2 import render
from charmhelpers.core.templating import render
from subprocess import check_output