James Laska
|
d2be1e83ce
|
Minor adjustments to CONTRIBUTING.md
|
2017-08-22 14:25:04 -04:00 |
|
James Laska
|
59b08cfbaf
|
Merge pull request #5604 from jlaska/ami_playbook_changes
Playbook changes to improve AMI publishing
|
2017-03-01 14:59:43 -05:00 |
|
James Laska
|
6d3c37b1ef
|
Merge pull request #5598 from jlaska/preflight_old_ha_inventory
Add unsupported primary pre-flight check
|
2017-03-01 14:51:02 -05:00 |
|
James Laska
|
0b1a4110c4
|
Merge pull request #4716 from ryanpetrello/release_3.1.0
Include getting started instructions for installing the gcloud CLI tool.
|
2017-01-14 07:39:11 -05:00 |
|
James Laska
|
0dfbc0a30e
|
Merge pull request #4498 from jlaska/request_configuration
Rewrite request_tower_configuration.sh
|
2016-12-19 12:02:33 -05:00 |
|
James Laska
|
ed8bbc2bbd
|
Merge pull request #3774 from ansible/AlanCoding-patch-2
Fix spelling of disassociated
|
2016-10-25 12:02:34 -04:00 |
|
James Laska
|
f1c4a919bc
|
Merge pull request #3117 from wwitzel3/3.0.1
fix issue with rbac_migrations logger
|
2016-07-25 12:15:53 -04:00 |
|
James Laska
|
2a791b8e90
|
Merge pull request #3099 from jlaska/tox
Add travis-ci integration using tox
|
2016-07-22 13:56:26 -04:00 |
|
James Laska
|
c6680c5f7e
|
Merge pull request #2466 from jlaska/cloud_verify_ssl
Honor CLOUD_VERIFY_SSL variable in rax import
|
2016-06-16 16:02:10 -04:00 |
|
James Laska
|
589834be44
|
Merge pull request #516 from AlanCoding/release_2.4.2
Correct spelling of "consisting" in help text
|
2015-11-30 11:37:46 -05:00 |
|
James Laska
|
bf31033701
|
Merge pull request #511 from ghjm/makefile-reversion
Revert earlier change to reprepro command
|
2015-11-26 15:58:23 -05:00 |
|
James Laska
|
c9c4f16319
|
Merge pull request #502 from ghjm/jenkins-ip_2.4.0
Change Jenkins server references from IP to DNS name
|
2015-11-13 12:47:16 -05:00 |
|
James Laska
|
cc0f78102e
|
Merge pull request #489 from jlaska/release_2.4.0
Attach handlers to django_auth_ldap
|
2015-11-05 12:55:55 -05:00 |
|
James Laska
|
9ea8dc845e
|
Merge pull request #488 from wenottingham/release_2.4.0
Add PowerShell version of request_tower_configuration. From @nitzmahone.
|
2015-11-05 12:18:40 -05:00 |
|
James Laska
|
69fe474c52
|
Merge pull request #482 from wenottingham/release_2.4.0
Generate a SHA-256-signed self-signed cert, not a SHA-1 one.
|
2015-10-29 13:30:29 -04:00 |
|
James Laska
|
2a7f1b7251
|
Merge pull request #455 from jlaska/proot_tmp_dir_el
Add EL support for proot COPR
|
2015-10-02 14:37:21 -04:00 |
|
James Laska
|
84268228b6
|
Merge pull request #450 from jlaska/packer-vmware
Add vmware-iso build target
|
2015-10-01 12:10:21 -04:00 |
|
James Laska
|
90c3ccfc8c
|
Merge pull request #444 from jlaska/versioned_reprepro
Add support for versioning the reprepro
|
2015-09-29 13:56:50 -04:00 |
|
James Laska
|
ba65396f1f
|
Merge pull request #431 from wenottingham/release_2.3
Fix another name typo.
|
2015-09-22 13:04:46 -04:00 |
|
James Laska
|
f460f10792
|
Merge pull request #427 from wenottingham/release_2.3
Add LGPL source directly so it gets shipped.
|
2015-09-21 20:31:36 -04:00 |
|
James Laska
|
f10ab47043
|
Merge pull request #428 from wenottingham/ldaplicense
Adjust python-ldap license text blurb.
|
2015-09-21 20:30:39 -04:00 |
|
James Laska
|
3e521d2f6a
|
Merge pull request #426 from wenottingham/release_2.3
Further license-related tweaks, per Pam.
|
2015-09-21 13:59:39 -04:00 |
|
James Laska
|
ecc866e061
|
Merge pull request #423 from wenottingham/release_2.3
Fix some typos in file names, and add licenses for some things we hav…
|
2015-09-21 10:58:51 -04:00 |
|
James Laska
|
dfca63d54c
|
Merge pull request #422 from wenottingham/release_2.3
Include source for bundled packages in bundle.
|
2015-09-20 15:05:16 -04:00 |
|
James Laska
|
222f63873c
|
Merge pull request #421 from jlaska/release_2.3
Include license information in packaging
|
2015-09-18 16:45:07 -04:00 |
|
James Laska
|
076c6c43a2
|
Merge pull request #420 from wenottingham/release_2.3
Add READMEs for the license directories.
|
2015-09-18 16:32:42 -04:00 |
|
James Laska
|
31a709d9ca
|
Merge pull request #419 from chrismeyersfsu/feature-python_licenses
vendored python licenses
|
2015-09-18 15:23:02 -04:00 |
|
James Laska
|
121c6e02c9
|
Merge pull request #416 from jlmitch5/release_2.3_js_licenses
add js library licenses
|
2015-09-18 10:02:33 -04:00 |
|
James Laska
|
b260e1e493
|
Merge pull request #417 from wenottingham/devel
Improve the failure message for umask in the installer playbook.
|
2015-09-17 19:09:01 -04:00 |
|
James Laska
|
4d5b46780a
|
Merge pull request #414 from jlaska/pbuilder
Build deb's using pbuilder
|
2015-09-16 16:48:37 -04:00 |
|
James Laska
|
fa77f581fa
|
Merge pull request #410 from wenottingham/release_2.3
Fix license in spec file.
|
2015-09-09 18:13:10 -04:00 |
|
James Laska
|
f56bcda53c
|
Merge pull request #408 from wenottingham/release_2.3
Add 'cost' to yum repo definitions for bundled repos.
|
2015-09-09 14:25:12 -04:00 |
|
James Laska
|
061e165c30
|
Merge pull request #405 from jlaska/release_2.3
Add CHECKSUM files for setup and bundle targets
|
2015-09-04 15:52:03 -04:00 |
|
James Laska
|
55e7458ebf
|
Merge pull request #400 from jlaska/setup_install_ansible
Attempt to install ansible in setup.sh
|
2015-09-03 09:18:22 -04:00 |
|
James Laska
|
50ff81388c
|
Merge pull request #394 from wenottingham/release_2.3
Update license audit toolset and license list for new requirements.txt.
|
2015-08-28 16:31:57 -04:00 |
|
James Laska
|
97d5b7e11b
|
Merge pull request #390 from jlaska/build_requirements
Gather requirements during distro package build
|
2015-08-27 09:54:41 -04:00 |
|
James Laska
|
2e6845769a
|
Merge pull request #388 from tgerla/sosreport-fixes
Fix up sosreport to remove some sensitive information and add some us…
|
2015-08-25 15:20:45 -04:00 |
|
James Laska
|
94c2906810
|
Merge pull request #372 from jlaska/makefile_requirements_adjustments
Simplify Makefile requirements targets
|
2015-08-12 13:34:25 -04:00 |
|
James Laska
|
3a61896cb5
|
Merge pull request #356 from wenottingham/404branch
Fix .ini web links for v2
|
2015-08-04 13:51:59 -04:00 |
|
James Laska
|
ad169fbaa0
|
Merge pull request #317 from tgerla/proxy-support
propagate standard proxy environment variables to all install tasks
|
2015-07-21 13:49:32 -04:00 |
|
James Laska
|
6e07bfc779
|
Merge pull request #281 from jlaska/aws_license_remove
Remove AWS license when processing /config DELETE
|
2015-06-15 13:45:43 -04:00 |
|
James Laska
|
be81c3f38a
|
Merge pull request #272 from jlaska/config_delete_204
Return 204 NO_CONTENT on /config DELETE
|
2015-06-07 13:35:05 -04:00 |
|
James Laska
|
8b02550174
|
Merge pull request #254 from jlaska/rpm_signature
Add RPM-GPG-KEY to tower.repo
|
2015-06-01 12:52:05 -04:00 |
|
James Laska
|
f4e3126c43
|
Merge pull request #249 from phips/install_patch_for_proxy
pip through proxy // changes as per jlaska request
|
2015-05-29 09:52:25 -04:00 |
|
James Laska
|
98306350c0
|
Merge pull request #233 from jlaska/flake8_cleanup
Additional flake8 cleanup
|
2015-05-20 20:39:46 -04:00 |
|
James Laska
|
89a4e43cd0
|
Merge pull request #216 from jlaska/packer_improvements
Update packer configuration to include vagrant
|
2015-05-15 15:36:44 -04:00 |
|
James Laska
|
b7a9d97e30
|
Merge pull request #179 from jlaska/postgresql_socket_directory
Force all platforms to use the same unix_socket_directories value
|
2015-04-30 15:58:09 -04:00 |
|
James Laska
|
22274d0dfb
|
Merge pull request #171 from jlaska/pg94_el_improvements
Improvements to pg94 install/conf for EL
|
2015-04-29 14:36:38 -04:00 |
|
James Laska
|
4441dde4cd
|
Merge pull request #155 from jlaska/pymongo_packaging
Update distro package dependencies for pymongo and supervisor.el6
|
2015-04-24 14:59:54 -04:00 |
|
James Laska
|
b17f89ac74
|
Merge pull request #118 from wenottingham/pippy-branch
Get pip package list in sosreport.
|
2015-03-31 11:48:40 -04:00 |
|
James Laska
|
2e3b82d5eb
|
Merge pull request #110 from wenottingham/cert-foo
AnsibleWorks -> Ansible, AWX -> Tower.
|
2015-03-24 16:31:50 -04:00 |
|
James Laska
|
d3134fea86
|
Merge pull request #102 from wenottingham/cert-branch
Add some comments about replacing the cert in the place people are most likely to notice it.
|
2015-03-16 13:08:40 -04:00 |
|
James Laska
|
8960f17f28
|
Merge pull request #9 from jlaska/trusty_support
Add Ubuntu-14.04 Trusty support
|
2014-03-10 15:59:18 -04:00 |
|
James Laska
|
41d4a6e717
|
Correct md syntax
|
2014-02-26 10:51:13 -05:00 |
|