Luke Sneeringer 0e8121f7f1 Merge branch 'master' into expunge-zeromq-unstable ...

Conflicts:
	setup/roles/awx_install/handlers/main.yml

2014-11-10 08:47:08 -06:00

..

templates/api

Additional markdown for job_template launch endpoint

2014-10-23 12:51:00 -04:00

tests

Remove MIDDLEWARE_CLASSES from UI test.

2014-09-10 15:12:17 -05:00

utils

Fixes an issue where we could reference a collections.OrderedDict on py2.6 where it's not available. Switching to the vendored ordereddict module

2014-08-13 13:20:46 -04:00

__init__.py

Happy new year!!!

2014-01-02 11:51:43 -05:00

authentication.py

Shift Django to 1.6.x (>= 1.6.7).

2014-09-10 12:17:35 -05:00

filters.py

AC-1040 Support ordering by type field.

2014-03-30 19:52:52 -04:00

generics.py

Add response headers for timing API requests, improve inventory script view performance.

2014-05-14 13:52:46 -04:00

models.py

Happy new year!!!

2014-01-02 11:51:43 -05:00

pagination.py

Happy new year!!!

2014-01-02 11:51:43 -05:00

permissions.py

Add a specific tower warnings file in the tower home directory.

2014-04-04 16:48:56 -04:00

renderers.py

Add response headers for timing API requests, improve inventory script view performance.

2014-05-14 13:52:46 -04:00

serializers.py

Add created_by and modified_by to some serializers

2014-11-07 10:45:53 -05:00

urls.py

Addition of a /ping/ endpoint to give basic HA info.

2014-10-20 08:04:14 -05:00

views.py

Merge branch 'master' into expunge-zeromq-unstable

2014-11-10 08:47:08 -06:00