11985 Commits

Author SHA1 Message Date
Matthew Jones
b906469b40 Add execution node information 2016-10-20 13:27:36 -04:00
Matthew Jones
e8669b0cbf Support celeryd autoreloading for dev environment 2016-10-20 13:27:36 -04:00
jaredevantabor
d84912bb2a potentially adding token to websocket url 2016-10-20 10:02:28 -07:00
jaredevantabor
bc1561fc67 Removing front end double parsing of socket messages
previously the socket messages were double encoded w/ quotations
2016-10-20 09:17:50 -07:00
Bill Nottingham
cced987862 Merge pull request #3751 from wenottingham/OH-IO
Add new AWS regions.
2016-10-20 10:14:31 -04:00
Wayne Witzel III
af82273948 don't double encode channel messages 2016-10-20 09:37:06 -04:00
Alan Rominger
532ee059ea Merge pull request #3746 from AlanCoding/uwsgi_reload
Hopefully get uwsgi to auto reload
2016-10-20 09:08:34 -04:00
Aaron Tan
22329e5b72 Merge pull request #3502 from jangsutsr/2363_implement_job_timeout
Implement job timeout
2016-10-19 23:54:51 -04:00
Leigh Johnson
6080ecceca Merge pull request #3749 from leigh-johnson/3737
If a job template has a survey, copy it too
2016-10-19 16:26:06 -05:00
Bill Nottingham
40fdd3eba5 Sync azure changes to Tower virtual environment 2016-10-19 16:49:49 -04:00
Bill Nottingham
94b20d4fc6 Also bump boto for new regions, per ryansb. 2016-10-19 16:16:05 -04:00
Bill Nottingham
5c69ed2e9f More regions! 2016-10-19 16:15:09 -04:00
James Laska
6c4dd57368 Copy requirements individually to avoid invalidating docker cache 2016-10-19 15:56:34 -04:00
Chris Meyers
5b60b14227 bump shade version 2016-10-19 14:18:00 -04:00
Chris Meyers
49c90b8f2d Revert "bump shade version"
This reverts commit 0125d114fdf8be5f3a5fdab856c92d82a2988607.
2016-10-19 14:17:04 -04:00
Chris Meyers
8a4d6b6f35 bump shade version 2016-10-19 14:07:20 -04:00
James Laska
ac553f7368 Add image to unit-test docker-compose 2016-10-19 13:48:27 -04:00
Leigh Johnson
ec140fb7da Hack copying of job_template.related.survey_spec into ui job copy flow,
resolves #3737
2016-10-19 12:45:28 -05:00
James Laska
ff8966dd48 Update unittest container to build ui-deps 2016-10-19 12:35:59 -04:00
Chris Meyers
b43945b0f2 Revert "bump shade version"
This reverts commit d0a7313a4ccb1cfca3c7655b34b61c6cb6861909.
2016-10-19 12:33:53 -04:00
AlanCoding
e7f16620bb Attempt to get uwsgi to auto reload 2016-10-19 10:39:17 -04:00
Chris Meyers
54683cbff4 fix amqp dep 2016-10-18 18:42:12 -04:00
Chris Meyers
6d07699b29 bump shade version 2016-10-18 18:02:30 -04:00
Chris Meyers
cbffb23d41 no one knows wtf the files in this dir a for, so don't serve them 2016-10-18 17:27:23 -04:00
Chris Meyers
87ea864466 sendfail syscall bad with crappy filesystems 2016-10-18 17:21:14 -04:00
Chris Meyers
64a15db91b fix nginx static files using 2016-10-18 15:51:01 -04:00
Wayne Witzel III
1e658219c4 Merge pull request #3741 from wwitzel3/nginx-static
fix awx/ui static path
2016-10-18 15:08:16 -04:00
Wayne Witzel III
99a009b613 fix awx/ui static path 2016-10-18 15:05:05 -04:00
Chris Meyers
4e049546a3 Merge pull request #3740 from wwitzel3/nginx-static
let nginx serve static files
2016-10-18 14:54:54 -04:00
Wayne Witzel III
a27c708127 let nginx serve static files 2016-10-18 14:52:10 -04:00
Chris Meyers
47495b4ea6 fix mime type issues 2016-10-18 14:38:24 -04:00
Chris Meyers
0c5d6e503d Merge pull request #3739 from chrismeyersfsu/improvement-nginx_honcho
put nginx into honcho flow
2016-10-18 14:23:54 -04:00
Chris Meyers
ad2bee1f57 sym link nginx config by popular demand 2016-10-18 14:23:33 -04:00
Chris Meyers
4f6d966bab put nginx into honcho flow
* allows for make docker-compose-test then make honcho flow
2016-10-18 14:19:18 -04:00
Wayne Witzel III
699e2c9c6f Merge pull request #3738 from wwitzel3/nginx-updates
make static directory before collecting
2016-10-18 13:01:12 -04:00
Wayne Witzel III
e716f6e259 make static directory before collecting 2016-10-18 12:58:11 -04:00
Wayne Witzel III
dd108549b6 Merge pull request #3736 from wwitzel3/nginx-updates
fix static files for API browser
2016-10-18 12:35:35 -04:00
Wayne Witzel III
f5e10bc57c fix static files for API browser 2016-10-18 12:15:01 -04:00
Wayne Witzel III
c0ae37dd54 Merge pull request #3735 from wwitzel3/nginx-updates
Update tower_tools image to run nginx
2016-10-18 11:35:25 -04:00
Wayne Witzel III
e9be93cd70 Update tower_tools image to run nginx 2016-10-18 11:16:38 -04:00
Aaron Tan
5fdd44c3f4 Fix mutable default argument issue. 2016-10-18 09:48:19 -04:00
sundeep-co-in
78a8ce9479 django i18n 2016-10-18 18:10:39 +05:30
Alan Rominger
4ba8b87065 Merge pull request #3728 from AlanCoding/workflow_labels
Workflow Labels
2016-10-18 08:40:09 -04:00
Chris Church
5e8a7eeb8a Return empty dict if no license present (or invalid key). 2016-10-18 00:22:15 -04:00
Chris Church
e02d945e1d Merge pull request #3703 from cchurch/allow-file-scm-urls
Enable support for file scheme in SCM URLs.
2016-10-17 23:51:10 -04:00
AlanCoding
41d7bd84a8 implement labels for workflows JT and workflow jobs 2016-10-17 17:38:42 -04:00
Aaron Tan
c595492950 Solve rebase conflicts. 2016-10-17 17:08:05 -04:00
Aaron Tan
21feae7c11 Rename default timeout and remove runtime_flag. 2016-10-17 16:56:39 -04:00
Aaron Tan
2362f34d27 Implement pluggable job explanation. 2016-10-17 16:56:39 -04:00
Aaron Tan
701c23171f Remove timeout fields from sys job & adhoc cmd. 2016-10-17 16:56:39 -04:00