Michael Abashian 49cf8f1e75 Merge branch 'devel' into 3201-labels-pagination

2017-06-27 11:59:12 -04:00

..

api

Merge pull request #6595 from jangsutsr/6234_set_priority_rules_for_find_matching_hosts

2017-06-23 14:04:18 -04:00

conf

Merge pull request #6220 from jangsutsr/6188_enable_ctint_category_specific_validation

2017-06-26 09:45:12 -04:00

lib

multi-host isolated heartbeat w tower-isolated check

2017-06-20 14:36:18 -04:00

locale

Pull Spanish updates from Zanata

2017-04-20 08:05:14 -04:00

main

Merge pull request #6745 from ryanpetrello/fix-6659

2017-06-27 11:52:36 -04:00

playbooks

Merge pull request #6617 from ansible/isolated_setup

2017-06-20 17:20:53 -04:00

plugins

adds per-host timeout

2017-06-21 13:45:27 -04:00

settings

make isolated rampart settings API-configurable

2017-06-26 15:47:14 -04:00

sso

Add Tower configuration category validation for TACACS+

2017-06-26 10:58:05 -04:00

static

Extend stdout background to width of text.

2016-12-14 13:50:51 -05:00

templates

add API versioning for /api/v2/

2017-03-30 15:11:12 -04:00

ui

Merge branch 'devel' into 3201-labels-pagination

2017-06-27 11:59:12 -04:00

__init__.py

updating versions for 3.1.3 release

2017-03-31 12:11:37 -04:00

asgi.py

flake8 fixes for Jenkins

2016-10-14 09:46:41 -04:00

devonly.py

…

urls.py

Update default error pages.

2016-02-02 23:00:07 -05:00

wsgi.py

…