External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-17 04:31:21 -03:30
Code Issues Packages Projects Releases Wiki Activity
5,009 Commits 54 Branches 19 Tags
Commit Graph

5009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Jones
4bcd19f833 Merge branch 'release_2.3.1' into stable 
* release_2.3.1:
  Add 2.3.1 to the reprepro distribution manifest
  Update version to 2.3.1 and update changelog
  Remove unused time import
  Fix proot controlpersist cleanup issue
 2015-10-02 16:33:31 -04:00
Matthew Jones
71081a5b63 Update version to 2.3.1 and update changelog 2015-10-01 14:40:21 -04:00
Matthew Jones
0146b8acb0 Remove unused time import 2015-10-01 14:40:20 -04:00
Matthew Jones
b4ed547b2b Fix proot controlpersist cleanup issue 
* Also removed psutil version and feature check from tasks.  We now
  include the most recent version of psutil all around
* Old versions of psutil must have had these Process() items as
  properties, they are functions now so we weren't properly evaluating
  them.  With this change we are and things are back to working normally
 2015-10-01 14:40:20 -04:00
James Laska
949f4cb15d Propagate necessary build changes from devel 2015-10-01 12:06:01 -04:00
James Laska
d7fb9b19b1 Fix reprepro/conf path in Makefile 2015-09-23 20:32:34 -04:00
James Laska
8358722c10 Fix OFFICIAL deb Makefile 2015-09-22 16:36:45 -04:00
Matthew Jones
66168fb6dc Merge branch 'release_2.3' into stable 
* release_2.3: (169 commits)
  Updated package changelogs
  Rephrase task name
  Make purge supervisor.conf conditional on 2.2 el6
  Fix another name typo.
  Update python-ldap license text.
  Add LGPL source directly so it gets shipped.
  Update font-awesome licenses per legal feedback
  Remove bundled_licenses - we are shipping the source for bundled items, and therefore do not need to provide this separately.
  Add more license texts.
  Add full Apache licenses to files, per Pam.
  Attempt to harden mongodb tgz download
  Correct DJRF/DJRF-mongoengine licenses, rename qsstats license to match pkg name.
  Fix some typos in file names, and add licenses for some things we have modified in our own repos.
  Update Ubuntu depends and ppa's
  Include source for bundled packages in bundle.
  Include license information in packaging
  Add READMEs for the license directories.
  vendored python licenses
  Add bundled licenses documentation
  Revert to stock libzmq3 for deb depends
  ...
 2015-09-22 15:37:31 -04:00
James Laska
618d69ecbc Updated package changelogs 2015-09-22 15:30:57 -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
Bill Nottingham
c2d1698a9b Fix another name typo. 2015-09-21 22:30:56 -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
Bill Nottingham
f668f75563 Update python-ldap license text. 
Change blurb to match what Fedora/RH ship for this package.
 2015-09-21 14:46:43 -04:00
Bill Nottingham
27869be4cd Add LGPL source directly so it gets shipped. 
(HAAAAAAAAAAAAAAAAAAAAAAACK)
 2015-09-21 14:01:04 -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
5ff2e84ef4 Update font-awesome licenses per legal feedback 2015-09-21 13:55:55 -04:00
Bill Nottingham
e4795111ef Remove bundled_licenses - we are shipping the source for bundled items, and therefore do not need to provide this separately. 2015-09-21 13:53:49 -04:00
Bill Nottingham
17f9fc6267 Add more license texts. 2015-09-21 13:45:45 -04:00
Bill Nottingham
a0b3647c84 Add full Apache licenses to files, per Pam. 2015-09-21 13:35:37 -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
Bill Nottingham
a470d9d6e8 Correct DJRF/DJRF-mongoengine licenses, rename qsstats license to match pkg name. 2015-09-21 10:42:40 -04:00
Bill Nottingham
3275ff3a18 Fix some typos in file names, and add licenses for some things we have modified in our own repos. 2015-09-21 10:35:48 -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
e1b6588602 Include license information in packaging 2015-09-18 16:42:03 -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
Bill Nottingham
766b275d26 Add READMEs for the license directories. 2015-09-18 16:00:12 -04:00
Chris Meyers
6c0e76d7e9 Merge pull request #418 from jlaska/release_2.3 
Add bundled licenses documentation
 2015-09-18 15:24:08 -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
Chris Meyers
8d3c7353fb vendored python licenses 2015-09-18 13:04:42 -04:00
James Laska
07574c9b64 Add bundled licenses documentation 
Also includes in the bundled tarball artifact.
 2015-09-18 10:04:49 -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
John Mitchell
68416fc8e0 add js library licenses 2015-09-17 00:01:25 -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
b57144046b Add support for pbuilder chroot builds 
Additional fixes include:
 * Clean and pyc files in debian/rules
 * Reprepro changes
 * Update debian standards version
 * Update OS distro detection
 2015-09-16 16:28:05 -04:00
Chris Meyers
92bdd776c9 rbac job & job template performance fix 2015-09-15 10:18:46 -04:00
Matthew Jones
0ac4359bec Purge superlance 
We no longer get memmon with our package vendoring changes.  Don't think
we need it anyway as we've got the socket service fixed.
 2015-09-11 14:43:28 -04:00
Matthew Jones
8785af996d Purge an old supervisor config 
Apparently awx_supervisor.conf was still hanging around in the debian
install.   We'll make sure we won't lay that file down and bump the
supervisor migration to make sure the file is removed permanently
 2015-09-11 14:43:28 -04:00
James Laska
32cf468059 Allow customizing npm path 
So jenkins can use `npm --no-color`
 2015-09-10 19:03:41 -04:00
James Laska
3f9dd3ab22 Simplify GPG keys 2015-09-10 16:26:59 -04:00
James Laska
19c847ae10 Use gpg --passphrase for signing CHECKSUM 2015-09-10 13:40:24 -04:00
James Laska
9d5d17fa70 Handle rpm --addsign pasphrase prompts 2015-09-09 18:51:41 -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
Matthew Jones
940910b9a3 Adding docker-compose development workflow 2015-09-09 17:17:48 -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
87d8808c2d Fix expect script timeout 2015-09-09 13:07:09 -04:00
James Laska
b7ddbc48b1 Disable timeout and correct sign.exp error 2015-09-09 12:13:55 -04:00
James Laska
06e6980eaf Fix expect script hang 2015-09-09 11:18:06 -04:00
James Laska
3a914619ce Improvements to the package signing script 2015-09-09 11:01:44 -04:00