summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Adding installer files to flake8 ignoreMatthew Jones2017-06-301-2/+2
* Merge branch 'containerization' into develMatthew Jones2017-06-3014-2/+633
|\
| * Updating make targets for fixes to bringing cluster up and svcsMatthew Jones2017-06-301-5/+11
| * Adding Makefile targets for local builds/deploymentsMatthew Jones2017-06-304-13/+35
| * Moving Openshift work to installer directory to reduce conflictsMatthew Jones2017-06-3013-0/+594
| * Support deploying Tower into OpenShiftMatthew Jones2017-06-291-1/+2
| * Implementing containerized tower packagingMatthew Jones2017-06-141-2/+9
* | Merge pull request #6817 from jangsutsr/6768_apply_validation_to_ctint_all_en...Aaron Tan2017-06-301-0/+4
|\ \
| * | Apply accumulated validation for CTinT all endpoint.Aaron Tan2017-06-291-0/+4
* | | Merge pull request #6833 from chrismeyersfsu/enhancement-insights_cred_summaryChris Meyers2017-06-301-1/+2
|\ \ \
| * | | add insights_cred_id to host->inventory summary fieldsChris Meyers2017-06-301-1/+2
* | | | Merge pull request #6835 from wenottingham/oh-no-the-synchronize-moduleBill Nottingham2017-06-300-0/+0
|\ \ \ \
* \ \ \ \ Merge pull request #6784 from marshmalien/rampartsViewsMarliana Lara2017-06-3037-67/+1005
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update PR based on review changesMarliana Lara2017-06-3014-23/+46
| * | | | Implementation of Instance Groups read-only views in Tower SettingsMarliana Lara2017-06-3036-67/+982
|/ / / /
* | | | Merge pull request #6827 from ryanpetrello/develRyan Petrello2017-06-301-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | fix a bug in cluster node version comparisonRyan Petrello2017-06-301-1/+1
|/ / /
* | | Merge pull request #6819 from ryanpetrello/fix-6810Ryan Petrello2017-06-303-2/+19
|\ \ \
| * | | isolated nodes should report their awx version in their heartbeatRyan Petrello2017-06-293-2/+19
* | | | fix job launch deadlockChris Meyers2017-06-301-1/+1
* | | | Merge pull request #6814 from jlmitch5/loggingProtocolCtitjlmitch52017-06-303-1/+24
|\ \ \ \
| * | | | add logging protocol and timeout to ctit uiJohn Mitchell2017-06-293-1/+24
* | | | | Merge pull request #6759 from AlanCoding/naming_preflightsAlan Rominger2017-06-300-0/+0
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #6695 from ansible/jangsutsr_6005_add_boto3_supportAaron Tan2017-06-297-81/+96
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add boto3 dependency and remove requests freezingAaron Tan2017-06-297-81/+96
* | | | | | Merge pull request #6815 from ryanpetrello/fix-rdbRyan Petrello2017-06-292-7/+11
|\ \ \ \ \ \
| * | | | | | fix the `make rdb` debugging toolRyan Petrello2017-06-292-7/+11
* | | | | | | Merge pull request #6809 from ryanpetrello/develRyan Petrello2017-06-290-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #6710 from AlanCoding/access_registryAlan Rominger2017-06-294-91/+40
|\ \ \ \ \ \ \
| * | | | | | | access_registry made simple dict with auto registrationAlanCoding2017-06-294-91/+40
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #6808 from ansible/AlanCoding-patch-2Alan Rominger2017-06-291-2/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Remove extra_hosts that breaks dev environmentAlan Rominger2017-06-291-2/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #6783 from jlmitch5/testLogAggregatorjlmitch52017-06-293-5/+54
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | add test log aggregator button to uiJohn Mitchell2017-06-283-5/+54
* | | | | | Merge pull request #6795 from jaredevantabor/skip-tags-job-tagsJared Tabor2017-06-298-12/+123
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | adding type ahead selector to surveyJared Tabor2017-06-294-8/+51
| * | | | | making job-tags and skip-tags select elementsJared Tabor2017-06-294-4/+72
|/ / / / /
* | | | | Merge pull request #6741 from jangsutsr/6711_trim_querystring_from_reverse_ou...Aaron Tan2017-06-292-2/+23
|\ \ \ \ \
| * | | | | Trim querystring from reverse outcome.Aaron Tan2017-06-272-2/+23
* | | | | | Merge pull request #6642 from jangsutsr/6593_enforce_mutual_exclusiveness_of_...Aaron Tan2017-06-295-11/+57
|\ \ \ \ \ \
| * | | | | | Expand scope of enterprise user types.Aaron Tan2017-06-205-11/+57
* | | | | | | Merge pull request #6705 from jangsutsr/6516_audit_cloud_regionsAaron Tan2017-06-291-9/+37
|\ \ \ \ \ \ \
| * | | | | | | Audit lists of cloud regions.Aaron Tan2017-06-231-9/+37
* | | | | | | | Merge pull request #6732 from jangsutsr/6719_aggregate_service_restart_attemptsAaron Tan2017-06-293-17/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Aggregate Tower service restart attempts.Aaron Tan2017-06-283-17/+24
* | | | | | | | | Merge pull request #6720 from AlanCoding/scm_inv_update_respAlan Rominger2017-06-295-31/+97
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix bug in response of inventory update with update_on_project_updateAlanCoding2017-06-262-20/+53
| * | | | | | | | | Separate Inventory Source API vs RBAC testingAlanCoding2017-06-234-11/+44
* | | | | | | | | | Merge pull request #6712 from AlanCoding/host_sublistAlan Rominger2017-06-292-1/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cache view parent obj & add prefetch to sublistsAlanCoding2017-06-252-1/+10