Updated openstack/openstack
Project: openstack/keystone  987e18edff18a5eb32c516495159351c0346cfa0
null
Adds fixture package from oslo

The mock library is added to test-requirements.txt since the
mockpatch fixture requires it.

Change-Id: I1b5b0c75f256382a685fceb2117db6d5b18d8c4f
(cherry picked from commit 07aa0a91a120c1b07cbfe800ec0f78abb81a7271)
Updated openstack/openstack
Project: openstack/horizon  96bd650e3304618b790e5f3fcdfc4d92fd4b146c
null
Fix inappropriate logouts on load-balanced Horizon

The session timeout code in the horizon/middleware.py can cause
inappropriate timeouts/logouts when running Horizon behind a load
balancer on two machines that are slightly out of sync time-wise.

Use timestamps rather than datetime as the arithmetic is simpler.

Closes-bug: #1243277
(cherry-picked from commit 13355dacdbfa9ef14a4e1c16afeffaece5c13a39,
 minus the unrelated settings.py changes.)

Change-Id: I23159d2dee7fc05653a99fc89fbfd4d52e988df5