12757 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
John Mitchell	2b37d04204	remove unwanted line	2017-05-25 11:54:26 -04:00
John Mitchell	7a927825ce	add scm inv source ui	2017-05-25 11:47:40 -04:00
Aaron Tan	903e3076aa	Merge pull request #6298 from jangsutsr/6237_prevent_ldap_user_from_imposing_existing_tower_user ... Prevent LDAP user from imposing existing Tower user	2017-05-22 11:08:21 -04:00
Bill Nottingham	a1de115094	Merge pull request #6306 from wenottingham/what-is-a-real-path-anyway ... Perform realpath() on paths passed to bubblewrap to avoid errors with symlinks	2017-05-22 11:07:02 -04:00
Wayne Witzel III	631f82b574	Merge pull request #6304 from wwitzel3/issue-6193 ... Extend SmartFilter to expand search and related search fields	2017-05-19 18:22:04 -04:00
Bill Nottingham	ff454a452f	Perform realpath() on paths passed to bubblewrap to avoid errors with symlinks ... bubblewrap is creating a mount tree from a namespace outside the one it's creating. Absolute symlinks will not resolve properly, causing errors. Filed @ https://github.com/projectatomic/bubblewrap/issues/195, but this should work around it without side effects.	2017-05-19 16:51:39 -04:00
Wayne Witzel III	530df327ca	Call filter from BoolOperand and catch LookupError	2017-05-19 16:49:25 -04:00
Chris Meyers	1b2ac592a8	Merge pull request #6303 from chrismeyersfsu/fix-host_filter_not ... remove not operator	2017-05-19 16:48:08 -04:00
Chris Meyers	cf26678cea	remove not operator code instead of commenting	2017-05-19 16:38:41 -04:00
Wayne Witzel III	b99a118aae	Revert back to more explicit ParseException	2017-05-19 16:15:44 -04:00
Wayne Witzel III	bac1e8b4fe	Extend SmartFilter to expand search and related search fields	2017-05-19 16:05:24 -04:00
Chris Meyers	fceb09dc8c	remove not operator ... * We've switched from Q() to Host.objects.filter() and you can't do ~(Host.objects.filter()). We'd need to create an AST to track the operations in order to perform the boolean logic ~ and we don't have time for that now.	2017-05-19 14:40:02 -04:00
Michael Abashian	ea267d0849	Merge pull request #6302 from mabashian/fix-ui-unit-tests ... Fixed failing ui unit tests	2017-05-19 13:43:16 -04:00
Michael Abashian	1af972fc39	Fixed failing ui unit tests	2017-05-19 13:33:40 -04:00
Wayne Witzel III	3cf698d4ae	Merge pull request #6301 from wwitzel3/v2-inv-kind ... add kind to Inventory summarizable fields	2017-05-19 11:35:49 -04:00
Wayne Witzel III	e4f4cc1372	add kind to Inventory summarizable fields	2017-05-19 10:59:50 -04:00
Aaron Tan	4f9875f895	Prevent LDAP user from imposing existing Tower user.	2017-05-18 16:39:58 -04:00
Bill Nottingham	4748f6d2e2	Merge pull request #5723 from wenottingham/cert-fu ... Generate self-signed cert once, instead of per-host.	2017-05-18 16:33:55 -04:00
Ryan Petrello	291a8c5cc1	Merge pull request #6294 from ryanpetrello/devel ... remove a hook QE no longer uses for testing task execution	2017-05-18 16:05:50 -04:00
Ryan Petrello	5a34f3a1a4	remove a hook QE no longer uses for testing task execution	2017-05-18 15:59:36 -04:00
Aaron Tan	1946730d8c	Merge pull request #6286 from jangsutsr/remove_rax_from_v320_migration_file ... Remove rax from v320 migration file	2017-05-18 15:08:27 -04:00
Matthew Jones	b172f04eaa	Merge pull request #6290 from ansible/fix_sysjobs_taskman_credentials ... Fix system jobs not starting due to task manager and cred changes	2017-05-18 13:13:45 -04:00
Matthew Jones	cf7fb8ddd7	Fix system jobs not starting due to task manager and cred changes ... * Task Manager logic wasn't assigning default instance group on system jobs * Task credential changes assumed the model would have a credential * Fix up an innocuous error symlinking rdb.py if it already exists	2017-05-18 13:10:48 -04:00
Chris Meyers	527078edb4	Merge pull request #6287 from chrismeyersfsu/fix-insights_system_id_host ... allow insights_system_id to be set to null via api	2017-05-18 13:04:13 -04:00
Greg Considine	cb933d2050	Merge pull request #6289 from wenottingham/redirect ... Get /api/ instead of /api.	2017-05-18 12:57:42 -04:00
Chris Meyers	136bdc06e9	remove insights_system_id uniqueness constraint	2017-05-18 12:51:25 -04:00
Bill Nottingham	6b88643517	Get /api/ instead of /api. ... Hitting /api gives a 301 redirection to /api/, might as well just go there out of the box.	2017-05-18 12:30:28 -04:00
Chris Meyers	e81a7e1c25	allow insights_system_id to be set to null via api	2017-05-18 11:31:58 -04:00
Aaron Tan	114598a56d	Remove rax from v320 migration file	2017-05-18 10:46:42 -04:00
Wayne Witzel III	7c2e5df659	Merge pull request #6282 from wwitzel3/smart-inventory ... Dynamic -> Smart Inventory	2017-05-17 16:36:51 -04:00
Wayne Witzel III	d652ed16d0	Dynamic -> Smart Inventory	2017-05-17 16:25:40 -04:00
Matthew Jones	a539a820a7	Updating celery autoscale and prefetch behavior ... * Increase total number of celery jobs to match what we are currently supporting in production with very large instances * Make sure celery in the development environment also uses fair scheduling without prefetching	2017-05-17 14:33:22 -04:00
Chris Meyers	8cf8e6c0c0	Merge pull request #6276 from chrismeyersfsu/improve-task_manager_performance_prefetch ... prefetch optimizations for task manager	2017-05-16 21:19:47 -04:00
Michael Abashian	1627cb830c	Merge pull request #6278 from mabashian/host-add-fix ... Fixed host add form	2017-05-16 16:41:57 -04:00
Michael Abashian	85ed1ce0be	Fixed host add form	2017-05-16 16:30:20 -04:00
Chris Meyers	047bcd92fe	Merge pull request #6274 from chrismeyersfsu/fix-scheduler_update_on_launch ... only consider update_on_launch inventory sources	2017-05-16 15:08:37 -04:00
Chris Meyers	067fdac8b1	prefetch optimizations for task manager ... * Prefetch all Jobs Types related instance group * Prefetch inventory updates inventory source. The attribute inventory_source.inventory_id is accessed when building the hash tables of the running tasks.	2017-05-16 15:05:20 -04:00
Alan Rominger	430852b73d	Merge pull request #6271 from AlanCoding/wfj_no_node ... Remove `execution_node` from WFJ serializer	2017-05-16 14:44:50 -04:00
Chris Meyers	9b771ae907	only consider update_on_launch inventory sources ... * When generating dependencies (i.e. dynamically launching Project Update and Inventory Update) only create the dynamic dependencies if update_on_launch is True.	2017-05-16 13:18:15 -04:00
AlanCoding	2cbb2c6d53	remove execution_node from WFJ serializer	2017-05-16 12:31:29 -04:00
Chris Meyers	d7b07f1f1f	Merge pull request #6273 from chrismeyersfsu/fix-read_error ... fix 50x error from nginx	2017-05-16 12:10:56 -04:00
Matthew Jones	575a7dd165	Use proper print syntax for Makefile in-line python statements	2017-05-16 10:58:28 -04:00
Chris Meyers	27c32de4a2	Merge pull request #6242 from chrismeyersfsu/implement-6203 ... associate insights machine id w/ host on fact scan	2017-05-16 10:27:45 -04:00
Michael Abashian	7fd406eaad	Merge branch 'mabashian-inventory-source-states' into devel	2017-05-16 08:37:24 -04:00
Michael Abashian	4648c5619e	Merge branch 'inventory-source-states' of https://github.com/mabashian/ansible-tower into mabashian-inventory-source-states ... # Conflicts: # awx/ui/client/src/inventories/main.js	2017-05-16 08:37:09 -04:00
Michael Abashian	984f863dac	Merge branch 'mabashian-inventory-codemirrors' into devel	2017-05-16 08:32:03 -04:00
Michael Abashian	786fa89db6	Merge branch 'inventory-codemirrors' of https://github.com/mabashian/ansible-tower into mabashian-inventory-codemirrors ... # Conflicts: # awx/ui/client/src/inventories/hosts/host.form.js	2017-05-16 08:31:45 -04:00
Michael Abashian	ee0ac72c89	Merge pull request #6261 from mabashian/inventory-bug-fixes ... Fixed inventory limit panels bug, breadcrumb and redirect bugs	2017-05-16 08:27:10 -04:00
Michael Abashian	e0a25b08e9	Merge pull request #6250 from mabashian/hosts-edit-groups ... Fixed host list related groups tab.	2017-05-16 08:24:59 -04:00
Michael Abashian	8f7a489c30	Merge pull request #6229 from mabashian/adhoc-related ... Fixed adhoc limit pattern when navigating from nested group to adhoc form	2017-05-16 08:23:25 -04:00