1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Commit Graph

358 Commits

Author SHA1 Message Date
Graham Mainwaring
f6c50cc63a Update Makefile so that ui-release does not get rebuilt over and over when troubleshooting build/release processes 2016-09-28 12:38:37 -04:00
Wayne Witzel III
42aab8ab83 removing websocket notification and service 2016-09-27 18:39:05 -04:00
Chris Meyers
cdb65ccac9 replace task manager with event driven scheduler 2016-09-27 14:16:18 -04:00
Shane McDonald
049d8a7bd6 Support GPG signing in the containerized RPM jobs.
- Added a script that allows for piping signing keys into the container’s stdin stream.
- Got sign.exp working
- I ended up getting mock to run as root, which means both RPM and DEB jobs both use —unsafe-perm now, so I added that back to the Makefile.
2016-09-22 14:19:47 -04:00
James Laska
dcf127ac6d Don't install csslint during requirements_jenkins 2016-09-21 15:27:44 -04:00
Shane McDonald
e958a12dab Remove --unsafe-perm
This breaks RPM builds… Will specify in DEB jobs only.
2016-09-21 11:45:54 -04:00
James Laska
94b440e7f5 Allow unittests from containers to work
Don't `sudo` for me, I'll `sudo` when I need it, yo.  This appears to
only affect the non-container based development workflow.  For folks
that still need to `make develop` outside of a container, please use
`sudo make develop`
2016-09-19 11:09:22 -04:00
Matthew Jones
f5d2c5c18a Merge branch 'ramparts_and_ha' into devel
* ramparts_and_ha: (21 commits)
  Rename database migrations for devel integration
  Integrate callback receiver refactoring
  Fix an issue running jobs in the cluster
  Implement a more dynamic celery queue system
  Purge old munin monitors and tools
  Refactor Tower HA Instance logic and models
  Docker compose improvements
  Initial Docker Compose workflow for Tower cluster
  Add memcached role for setup playbook
  Removing qpid from deb packaging
  Refactor rabbitmq role
  Integrate memcached into setup playbook
  Remove mongodb shutdown task
  Remove dependency on erlang_sd_notify
  Add initial rabbitmq role
  Initial rabbitmq setup playbook integration
  Update development environment for rabbit
  Replace qpid with rabbitmq
  Remove redis role from setup playbook
  Update qpid packaging, remove migrations
  ...
2016-09-15 10:19:57 -04:00
Shane McDonald
05add1a751 Add --unsafe-perm to ui-deps-built
Node thinks we’re stupid. https://github.com/nodejs/node-gyp/issues/454
2016-09-13 15:35:35 -04:00
James Laska
183660a133 Fix '..' typo when installing jenkins requirements 2016-09-13 11:01:00 -04:00
James Laska
7d95b15812 Ensure make docker-clean exits cleanly 2016-09-13 11:01:00 -04:00
Matthew Jones
807cced571 Implement a more dynamic celery queue system
* Meant to be a starting point to more efficiently manage work routing
  and to balance work across all tower nodes
* Integrate flower as a dev tool that starts alongside other nodes.
  Helpful for observing and monitoring the queues/exchanges
* For the moment, force the task manager to only run on one node (not
  sure if this is needed)
* Define queues and routes for all task work
* Bump celery version to 3.1.23
* Expose flower through haproxy
2016-09-09 15:18:18 -04:00
Matthew Jones
0c1e1fa2fb Refactor Tower HA Instance logic and models
* Gut the HA middleware
* Purge concept of primary and secondary.
* UUID is not the primary host identifier, now it's based mostly on the
  username.  Some work probably still left to do to make sure this is
  legit.  Also removed unique constraint from the uuid field.  This
  might become the cluster ident now... or it may just deprecate
* No more secondary -> primary redirection
* Initial revision of /api/v1/ping
* Revise and gut tower-manage register_instance
* Rename awx/main/socket.py to awx/main/socket_queue.py to prevent
  conflict with the "socket" module from python base
* Revist/gut the Instance manager... not sure if this manager is really
  needed anymore
2016-09-08 13:37:53 -04:00
Matthew Jones
ebf103f345 Initial Docker Compose workflow for Tower cluster
The goal is to share a common pattern with the existing development work
2016-09-08 10:18:14 -04:00
Matthew Jones
f988877bae Merge branch 'stable' into devel
* stable: (24 commits)
  Updating changelogs for 3.0.2 release
  fixing deprecated_team.organization credential migration
  Fix issue when installing bundled ansible on el6
  fixed localed date stuff
  update test to check org_auditor access
  ensure team organizations are assigned to credentials
  temporarily pin the pytest version until the ldap error can be fixed
  fixed locale
  fix date locale angular scheduler
  Make sure org admins can see credential after migration, comment updates on related tests add clause in test to verify automatic setting of org of new team credential
  Update team admin credential migration test to current state-of-knowledge
  fix ng-toast rel, resolves #3197 (#3316)
  allow users to edit their first and last name
  Revert "Prevent ignored task from being displayed as failing."
  Revert "Modify job event save behavior"
  fixing old tests for new user creation permissions
  Clean venv on 'make clean'
  Resolve KeyError by coercing instance_id to a str
  Update cloudforms dynamic inventory
  Update foreman inventory script
  ...
2016-08-31 14:34:52 -04:00
AlanCoding
5f15b00a8a fix error Alan introduced in Makefile syntax 2016-08-29 11:46:16 -04:00
AlanCoding
52dc28f7c5 jshint given desired commands, although not working 2016-08-29 11:32:42 -04:00
AlanCoding
1372623080 temporarily pin the pytest version until the ldap error can be fixed 2016-08-26 14:03:41 -04:00
AlanCoding
3a86a41685 disable all the UI unit tests until things are sorted out 2016-08-26 13:51:49 -04:00
AlanCoding
260e93571e outright remove the old jshint install 2016-08-26 13:35:53 -04:00
AlanCoding
7cfb79110f updating Jenkins UI targets 2016-08-26 13:30:08 -04:00
Alan Rominger
c87637ea7d Merge pull request #3325 from AlanCoding/temporary_pytest_bump
Temporary pytest bump for tower unit tests
2016-08-26 12:58:48 -04:00
Matthew Jones
b507dc53ea Putting a bow on some of the new dev workflow
* Documentation of the developer variety
* Defaulting the COMPOSE_TAG to develop, can be overridden
* Automatic docker login assuming gcr login
* Including a manual build step as an alternative to gcr
* Make qpid container shut the f**k up when it's running
2016-08-25 11:57:31 -04:00
Matthew Jones
c8e2f73d48 Support pulling the dev container image from gcr
This will be branch-relative.  If you are ont he `devel` branch then it
will pull that tag, it will try to pull the branch you are on and can be
overridden with the COMPOSE_TAG environment variable
2016-08-24 22:45:20 -04:00
Matthew Jones
dcb4959443 Initial qpid development work
* Switch base tower devel image from u14.04 to c7
* Switch container image to build python dependencies into itself
  instead of forcing it to be built on startup
* Upgrade venv pip to 8.1.2
* Neuter queue.py which was heavily tied to redis and was basically
  orphaned code
* Alter local_settings to override default cache settings and use
  memcached
* Alter local settings to refer to qpid instead of redis for celery
  broker
* Purge redis python dependencies and add qpid and memcached
* Update docker-compose to purge redis and add qpid and memcached
2016-08-24 16:23:47 -04:00
AlanCoding
50ec9ca259 temporarily pin the pytest version until the ldap error can be fixed 2016-08-24 15:54:33 -04:00
Graham Mainwaring
f5b4c63173 Clean venv on 'make clean' 2016-08-19 16:28:09 -04:00
Matthew Jones
8893f8278a Merge branch 'release_3.0.2' into devel
* release_3.0.2: (126 commits)
  Disable permissions tab in Credential > Edit form if Credential is private (#3288)
  Tweaked the popover text for job and skip tags on JT add/edit
  Workaround a cascade setnull polymorphic issue
  flake8
  Fixed old test expectations
  Made it so the credential organization field can't be changed
  Skip some unit tests
  Fixed org auditor visibility of team credentials
  Fix sosreport
  fix credential kind options for list
  interpret any code below 300 as success
  bail when status code is over 300
  Make CloudForms inventory_script work
  Use no_log when handling passwords
  Prevent ignored task from being displayed as failing.
  making ec2 cred optional on group->edit
  making ec2 credential optional for ec2 inventory
  Revert "Fix to ensure org auditors can see team credentials"
  Fixed team credential list to work with corrected permissions
  Making the username and password fields optional
  ...
2016-08-18 22:52:55 -04:00
Leigh Johnson
ce61fe4a42 Refactor UI Build System (#3203)
* initial build trial, clean up awx/ui

* fix hardcoded refs to ng-toast, add jshint preloader

* remove browserify test

* update grunt-jshint -> jshint module loader, browser-sync, update dev targets to build-docker-machine & build-docker-cid, fix blocking tasks

* less autoprefixer

* sample build commands

* fix release build

* update README

* karma config stub

* webpack config for karma tests

* karma preview for shane

* fix build-docker-machine target

* karma+webpack test pipeline configuration, stub tests

* fix smart/job status icons classes

* fix jquery + jsyaml shims, fix LESS cascade

* fix angular-codemirror dependency, explicitly import style/mode dependencies

* shim jsonlint

* fix angular-scheduler AMD imports, remove jquuery-ui shim, fix release config

* use closed $.fn.datepicker for system-tracking

* remove packaging/node/

* remove old tests

* shrinkwrap fragile dependency sandcastle, update README, lint

* first pass at fixing rrule shim

* update makefile targets

* update gitignore w/ new flag file

* add saucelabs karma config

* add license controller test

* add examples of service and directive tests

* Makefile flubs

* consolidate clean-ui target, compulsively update flag file location

* dep on CJS/AMD/UMD compatible version of rrule lib, fix example tests/config for demo

* boilerplate karma config for saucelabs (should be abstracted to common config after proven to work)

* update docs

* docs feedback

* update Dockerfile with Node 6.x dep
2016-08-17 16:09:54 -04:00
Graham Mainwaring
d51edff8a8 Ubuntu 16 support (#3251) 2016-08-16 13:41:23 -04:00
Graham Mainwaring
e93fde2f1a Add VMware provider for Vagrant images and rename make targets (#3180)
This change adds a Makefile target to build a Vagrant .box file that uses the VMware Vagrant provider. Previously, we could only build Virtualbox .box files. The Virtualbox Makefile target is renamed from virtualbox-ovf to vagrant-virtualbox, and the new VMware target is named vagrant-vmware.
2016-08-02 10:44:29 -04:00
Graham Mainwaring
5a1732d3bd Build cffi from source to avoid binary wheel problems 2016-07-05 11:44:27 -04:00
Graham Mainwaring
ac8b8dbfb6 Fix Openstack inventory on Ubuntu 12 (#2318)
* Update setuptools and pip when creating venvs
2016-06-10 09:21:41 -07:00
Graham Mainwaring
9a17e0230c Pick the correct interpreter when bytecompiling 2016-05-20 15:38:12 -04:00
Matthew Jones
dad72e297c Update the default path for celerybeat-schedule
If the celerybeat database becomes corrupt then it can prevent starting
some services for Tower.  This happens in an obscure way and currently
that database is stored at the top of the source tree.   This moves it
into the container managed space so that failure scenario won't persist
if the container is re-created
2016-05-09 11:36:53 -04:00
Chris Meyers
4a7ba2bfb2 Merge pull request #1803 from chrismeyersfsu/feature-pg_install
Feature pg install
2016-05-04 15:58:36 -04:00
Graham Mainwaring
31a48d5c31 Merge pull request #1569 from ghjm/ansible_26_venv
Use system Python interpreter rather than SCL Python for Ansible venv
2016-05-04 15:50:30 -04:00
Chris Meyers
8b1c5d80dc install postgres for the customer 2016-05-04 12:11:21 -04:00
Matthew Jones
cf7b71ae2c Merge branch 'release_2.4.5' into devel
* release_2.4.5:
  Remove distribute from the setup virtualenv if installed (#1631)
  Update changelogs for 2.4.5 release
  Only export changed targets in reprepro
  Improve the efficiency of the stdout dump database migration
  Added logic to not show the loop summary events in the UI by looking at event_data.event_loop.
  Handle runner items from ansible v2
  bump boto
  fix case of Ansible v2 _result.cmd is list for release 2.4.5
  Handle both string and list hosts in our hosts->name conversion
  Default play names to the hosts the play was run against
  Use better isinstance(x) type checking
  Backporting test fixes from PR #1020: Fix error with ad hoc command events when running in check mode.
  Fix for tasks breaking when using 'yum' with ansible 1.9.4
  Bump 2.4.5 version, changelogs, and reprepo
2016-04-22 10:54:23 -04:00
John Mitchell
a8470989dd removal of tmp dir when sync-ui is run 2016-04-20 13:49:18 -04:00
Akita Noek
31920c6700 Removed awx/api/tests dir from Makefile since it no longer exists 2016-04-20 11:48:09 -04:00
Graham Mainwaring
9a9b198b28 Only export changed targets in reprepro 2016-04-20 10:13:26 -04:00
Graham Mainwaring
e311c7bae5 Use system Python interpreter rather than SCL Python for Ansible venv 2016-04-18 12:36:15 -04:00
Matthew Jones
6150addc2e Updates to makefile to coerce pip install and usage for dependencies 2016-04-13 11:18:52 -04:00
Matthew Jones
a0fd546bdf Force jenkins pip dependencies to override the base 2016-04-07 10:33:20 -04:00
Matthew Jones
86cca77b43 Make sure requirements_jenkins invokes the other requirements sections 2016-04-06 20:33:44 -04:00
Chris Meyers
01d323fd06 fix dev container pip init process 2016-04-06 14:28:34 -04:00
Matthew Jones
0a6df40066 Improvements to docker compose workflow with new packaging changes 2016-04-06 12:24:19 -04:00
Graham Mainwaring
a6acb5181a Merge pull request #1417 from ansible/python27_el6
EL6 Python 2.7 and Tower virtualenvs
2016-04-06 10:57:18 -04:00
Graham Mainwaring
ce5be7faa5 Moved awx packages inside venv, restructured spec file, restructured Makefile 2016-03-25 13:10:47 -04:00
Graham Mainwaring
ba916ed25f Preliminary EL6 SCL Python 2.7 support 2016-03-23 15:46:00 -04:00
Wayne Witzel III
5ce4cb95fa Update test make target, no fact/tests 2016-03-22 10:28:05 -04:00
Wayne Witzel III
7354d1da2c Fix test_coverage make target 2016-03-22 09:46:46 -04:00
Graham Mainwaring
1e8e53e811 Merge branch 'devel' of github.com:ansible/ansible-tower into python27_el6
Conflicts:
	packaging/rpm/ansible-tower.spec
	tools/docker-compose/start_development.sh
2016-03-21 12:13:50 -04:00
Graham Mainwaring
9bd1520efb Builds an RPM for EL6 with SCL python27 and httpd24 2016-03-21 12:11:19 -04:00
Matthew Jones
46bbc83d0d Changes for Tower virtualenv support
* Break requirements down into ansible and tower reqs
* Generate separate Ansible and Tower virtual environments
* Install appropriate requirements files into each one
* Modify development tools to use these venvs instead of our old
  site-packages
* Modify settings to indicate venv enablement and location of venvs
* Modify tasks to use the proper virtual environment for its purpose
2016-03-21 12:11:19 -04:00
AlanCoding
a0ce6d7a25 fix regression of development package naming 2016-03-17 22:54:12 -04:00
Matthew Jones
63b01bb04b Fix up the docker-refresh Makefile target
This allows you to cleanup the images without requiring a rebuild necessarily
2016-03-16 13:11:05 -04:00
Matthew Jones
714d13eefd Update docker development workflow to not require make develop 2016-03-02 12:09:42 -05:00
Matthew Jones
99ec07b8a5 Merge branch 'notifications_work' into devel
* notifications_work: (23 commits)
  Updates to notification unit tests after @wwitzel3's feedback
  Fix some notifications issues and write some tests
  Add notification system documentation
  Clean up flake8 related issues
  Fixing up some unicode issues
  Implement tower ui view url on models
  Sanity check and force proper types in admin check
  Proper type for in check
  Adding migration and base notification type
  Add a periodic administrative notification
  Refactor message generator
  Support notification password field encryption
  Notification configuration type checking
  Refactor NotificationTemplate to Notifier
  Implement irc notification backend
  Add webhook notification backend
  Pagerduty and Hipchat backends plus some cleanup
  Notification serializers, views, and tasks
  Implement notification serializer and validations
  Notification endpoints and url expositions
  ...
2016-02-29 16:50:33 -05:00
Matthew Jones
c3121211c3 Merge branch 'release_2.4.4' into devel
* release_2.4.4: (35 commits)
  Update changelog for 2.4.4 release
  Make pycompile non-fatal during deb build
  Revert "Add virtualenv site-pagkages to Python path before system dist-packages, to get new setuptools"
  Roll back mock version due to packaging issues
  Add virtualenv site-pagkages to Python path before system dist-packages, to get new setuptools
  change to warning behavior
  Resolve bug when building with /bin/sh on Ubuntu
  Attempt to workaround pip install issue
  point at packages with source on pypi
  Mock requires a newer setuptools when building requirements
  requests needs openssl
  Properly set the shell during directory migration
  pyrax bumpb new python license
  Typo's are bad and should be vanquished
  Conditionally install 2.6 python requirements
  separate pip requirements file for python2.6
  Added missing 'skipped' field for no_log
  Obey no_log even more when using ansible 2.0
  bump shade from 0.5.0 to 1.4
  RHEL5 compatibility and handling of error scenarios
  ...
2016-02-22 10:09:47 -05:00
Wayne Witzel III
18ea2e0201 default to reuse-db for testing 2016-02-05 21:40:01 -05:00
Matthew Jones
96b0fb168f Updating makefile migration generator 2016-02-04 15:52:23 -05:00
Chris Church
60224cdbe4 Update Django to 1.8 and DRF to 3.3, add new Django migrations, update serializers/pagination/metadata, update browsable API styling. 2016-02-02 17:48:04 -05:00
James Laska
cced99f75d Resolve bug when building with /bin/sh on Ubuntu
Ubuntu uses /bin/sh by default.  This change properly compares strings in a
POSIX compliant manner.
2016-02-02 12:45:08 -05:00
Wayne Witzel III
3982f34392 Merge pull request #764 from wwitzel3/docker-refresh
add a docker-refresh make target
2016-02-02 09:39:56 -05:00
Wayne Witzel III
71a1547c3a fixing ad_hoc imports
flake8 fixes

Fix and add awx/api/tests

added fact tests

added proper xml reports for jenkins

added jenkins requirements and adjusted Makefile target
2016-02-01 18:37:56 -05:00
Wayne Witzel III
3d4580611e added pytest to requirements_dev
reworking test strucutre

reworked pytest.ini, removed functional imports, updated req_dev

remove unneeded __init__ files

add testing checker to local_settings examples

adding testing packages to system Python for docker
2016-02-01 18:37:56 -05:00
Wayne Witzel III
5d6ea242c0 reorganzing tests folder
make tests a module

refacotring to local imports for tests

fixing test import of tasks

fixing test import of tasks

more testing fixups
2016-02-01 18:37:56 -05:00
Wayne Witzel III
a4aadc0b86 add a docker-refresh make target 2016-02-01 13:13:03 -05:00
James Laska
305b4fdead Typo's are bad and should be vanquished 2016-01-29 09:54:48 -05:00
James Laska
6b20539e38 Conditionally install 2.6 python requirements 2016-01-29 09:03:03 -05:00
Matthew Jones
87e50734a6 Merge branch 'release_2.4.2' into devel
* release_2.4.2: (23 commits)
  Updating 2.4.2 changelogs
  fix the connection check fix
  more robust check added to mongo db connection
  Adding a body to our OPTIONS requests fixes 415 error responses in IE11 and Edge.
  Don't hard-fail if default isn't defined on survey
  fixed custom login info bug
  Allow an org admin to delete project updates
  Disable elasticache instance gathering for aws
  Fix DEB builds by adding 2.4.2 to reprepro conf
  When the panel lists were consolidated down the list name was changed to 'all_jobs.'  When a job is clicked from the activity stream it should show the job list filtered down by ID.
  Rolled back job url change
  track modules on system tracking page by index
  correct spelling of consisting in help text
  Fixing up flake8
  The "job" href links in the activity stream don't point to the job details page.  This is an update to the jobs href to point to /#/jobs/(job.id).
  Wrapped the SourceChange call in a function so that it can be called without clearing the credential.  This fixes a bug where the credential was not showing up in the initial edit dialog even though the data was sent properly via the API.
  Revert change to Makefile, which was causing old .deb versions to be dropped from the repo
  Refactor scan_packages for os detection
  Remove stray debugging lines
  Add SUSE, OpenSuse and Debian to scan_packages
  ...
2015-12-09 13:06:47 -05:00
John Mitchell
364872a678 fixed typo of cp command 2015-12-09 10:19:34 -05:00
John Mitchell
c9d501c562 updated test-ui make target to be able to only run a single test file 2015-12-08 18:35:00 -05:00
John Mitchell
856e6c5c59 fixed test-ui debug mode not showing source files and phony tasks comment 2015-12-08 16:55:43 -05:00
John Mitchell
0b43398ef6 Rehaul of ui build process
Updated make tasks
Added coverage reports for ui
Added browser-sync support
Updated contribution doc
Updated npm dependencies (Jenkins and dev environment can both use Node 4.2.1)
2015-12-06 16:41:48 -05:00
Graham Mainwaring
54be15a694 Revert change to Makefile, which was causing old .deb versions to be dropped from the repo 2015-11-25 09:47:29 -05:00
James Laska
60a2787468 Use correct aw_repo_url when building packer 2015-11-06 15:19:35 -05:00
James Laska
fc8f8811af Resolve issue on precise keeping old debs around
Upgrades on precise kept installing the oldest 2.4.0 package in the pool.  The
following fix appears to correct that problem.
2015-11-05 12:53:15 -05:00
James Laska
71e9ce61e4 Revert "Add CFLAGS when building rhel6 site-packages"
To make this work, we'll also need:

    CFLAGS=-Qunused-arguments

For now, we'll explore forking dm.xmlsec.bindings.

This reverts commit be83561bfe996d5e5b2e291787f2e863fa5b9203.
2015-11-04 16:13:34 -05:00
James Laska
8a97a26aba Add CFLAGS when building rhel6 site-packages
Attempts to resolves https://trello.com/c/DL7MgYyO
2015-11-04 15:58:10 -05:00
James Laska
3ae78ca6e8 Fix typo in clean target 2015-10-15 20:30:36 -04:00
Matthew Jones
523a96ebce Add mongo shell container entrypoint also 2015-10-09 12:16:49 -04:00
Matthew Jones
531f00b1ac rm the old docker run container after stopping 2015-10-09 12:04:34 -04:00
Matthew Jones
bfc9512dc7 Also remove .deps_built with make clean 2015-10-09 11:58:48 -04:00
jlmitch5
6883d70805 fixed tmp dir deletion in make clean 2015-10-08 10:58:30 -04:00
Matthew Jones
dbd0a01410 Merge branch 'release_2.3.1' into devel
* 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
  Propagate necessary build changes from devel
  Update reprepro components
  Reenable the reprepro i386 repository
  Fix supervisor migration
  Fix reprepro/conf path in Makefile
  prefer the first version when packages are ambiguous
  Correct error message
  Fix omission
  Correct conditional stmt
  Improve logging when sourcerpm fails
  Fix typo
  Fix OFFICIAL deb Makefile
2015-10-02 16:37:45 -04:00
James Laska
949f4cb15d Propagate necessary build changes from devel 2015-10-01 12:06:01 -04:00
James Laska
8c5f7cf9b9 Add vmware-iso build target 2015-09-30 12:56:29 -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
Chris Meyers
4111056b81 add docker-compose-test directive to Makefile 2015-09-29 10:45:25 -04:00
James Laska
f62814cc90 Add support for versioning the reprepro
This allows customers to install old versions of tower using older setup
tarballs.
2015-09-29 09:12:14 -04:00
James Laska
531fc4d8ed Correct reprepro/conf path in Makefile 2015-09-23 20:33:40 -04:00
James Laska
d7fb9b19b1 Fix reprepro/conf path in Makefile 2015-09-23 20:32:34 -04:00
James Laska
7582458a0a Cleanup merge fallout from release_2.3 2015-09-23 16:10:40 -04:00
James Laska
8358722c10 Fix OFFICIAL deb Makefile 2015-09-22 16:36:45 -04:00
Matthew Jones
256af567de Merge branch 'release_2.3' into devel
* release_2.3: (24 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:57:32 -04:00
Matthew Jones
4cf2f32451 Remove the contents of tmp/ on clean 2015-09-22 11:04:40 -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