Updated openstack/openstack
Project: openstack/trove  1d9e282c06235807898acb53527b5dfb7325ce50

Handle exception from pexpect child.close

When pexpect child.close(force=True) is called to close a sudo process, an
exception may be raised on certain operating systems. Terminating a sudo
process as a non-root user succeeds on Ubuntu 12.04 but fails on 14.04.

Handle this exception and try to kill the child process using 'sudo kill'.

See related change https://review.openstack.org/#/c/100353 that addresses
another instance of the same issue.

Change-Id: I4bd9e4b98479e33604545713337440ce81ca64ee
Partial-Bug: 1343344
Updated openstack/openstack
Project: openstack/python-heatclient  42c509677046826d6990edf9adeb3dca1ea4c1f0

Revert "Add keystone v3 auth support"

This reverts commit a98c1f3617604c4871263ff9cc986b27f302ef46.
The new usage of session doesn't work with resources or events.

Conflicts:
	heatclient/tests/test_shell.py
Closes-Bug: #1349467

Change-Id: Ib5b0db81454abe647aca6461dd7bd5f197267fb8