* origin/celery-refactor: (33 commits)
Fix spelling mistake
Jobs begin in the waiting state
Don't raise an exception at the end of a task if we are running unit tests
Enable canceling on certain levels.... fix up some unit tests
Check for invalid tasks and mark created tasks as failed when constructing task chains
Fix merge spacing from conflicted merge
Fix some bugs and show more error detail on a current task when a previous task fails
Leave another TODO on the job runner, fix a misspelling on the project update hook
Initial work towards the celery refactor... adjusting logic to allow building a worker chain... temporarily relax requirements on status checks
Remove 'awx-' prefix when reporting version
Explicitly include the egg-info in rpm packaging
Fixing store references to point to http://www.ansible.com/ansible-pricing
Update make develop command, version check after package rename.
AC-992 Fix inventory import tests.
AC-967 Fixed job name in the host status fly-out. Text now wraps rather than extending beyond boundaries of pop-over. Removed status label- just show red/green dot. Clicking on ID or red/green dot shows the status dialog. When dialog closes the window.resize() watcher is restored.
AC-976 now using custom javascript to apply ellipsis to long group and host names. Fixed indes.html title.
Fix ansible-tower deb build
Rename package awx to ansible-tower
AC-976 add job template name to activity stream
AC-979 using activity stream object arrays correctly. AC-980 fixed Action label on detail dialog.
...
* origin/master: (28 commits)
AC-995 fixed typo and added extra error handling in case we actually cannot parse inventory variables. If that does happen, we now alert the user and keep the application stable and running.
Use supervisorctl when restarting celeryd on Ubuntu
Revert custom supervisor initscript
fix for the small viewport issue (https://www.dropbox.com/s/dmf4aixfv7k67cm/Screenshot%202014-01-29%2015.19.52.png) where group name div gets pushed to a new line.
Fixed AS widget breadcrumb links
AC-977 Fixed raw html showing up in Action field on detail dialog. Added a subtitle on the AS widget. On inventory groups/host page the subtitle explains what activities are being displayed, and only activities realted to the selected group (on the inventory page) are displayed. If All Hosts selected, then all activities for all groups related to the current inventory are displayed. Also, brought back activity stream button for inventory hosts.
During AMI boot, use custom initscript name
Update tower-setup filename used in AMI build
AC-578 - Add custom supervisor initscript on ubuntu
Remove 'awx-' prefix when reporting version
Explicitly include the egg-info in rpm packaging
Fixing store references to point to http://www.ansible.com/ansible-pricing
Update make develop command, version check after package rename.
AC-992 Fix inventory import tests.
AC-967 Fixed job name in the host status fly-out. Text now wraps rather than extending beyond boundaries of pop-over. Removed status label- just show red/green dot. Clicking on ID or red/green dot shows the status dialog. When dialog closes the window.resize() watcher is restored.
AC-976 now using custom javascript to apply ellipsis to long group and host names. Fixed indes.html title.
Fix ansible-tower deb build
Rename package awx to ansible-tower
AC-976 add job template name to activity stream
AC-979 using activity stream object arrays correctly. AC-980 fixed Action label on detail dialog.
...
Conflicts:
awx/ui/static/js/controllers/Inventories.js
awx/ui/static/js/lists/InventoryHosts.js
awx/ui/static/js/widgets/Stream.js
Matthew Jones
Chris Houseknecht
James Laska
Chris Church
Jenkins
