Shane McDonald 580004b395 Merge remote-tracking branch 'downstream/release_3.3.0' into devel ...

# Conflicts:
#	awx/main/notifications/slack_backend.py

2018-09-18 08:11:50 -04:00

..

__init__.py

fixed copyright date

2015-06-11 16:10:23 -04:00

defaults.py

Merge remote-tracking branch 'downstream/release_3.3.0' into devel

2018-09-18 08:11:50 -04:00

development_quiet.py

remove statsd

2016-05-10 11:56:04 -04:00

development.py

Merge remote-tracking branch 'tower/release_3.3.0' into devel

2018-08-10 11:54:34 -04:00

local_settings.py.docker_compose

parallelize test running

2018-05-16 14:29:15 -04:00

local_settings.py.example

Remove some obsolete code.

2018-02-26 14:55:13 -05:00

production.py

Replace logging-related restart with dynamic handler

2018-05-02 09:47:22 -04:00