Commits · 58e7037f1e64fc7a0691ac4a00a7b08cbc2dc764 · OpenEdx / configuration · GitLab

20 Feb, 2015 9 commits
- Merge branch 'e0d/edx-notes-api' into max/merge-refactor · 58e7037f
```
Conflicts:
	CHANGELOG.md
	playbooks/roles/edxapp/tasks/deploy.yml
	playbooks/roles/insights/defaults/main.yml
	playbooks/roles/xqwatcher/tasks/deploy_watcher.yml
```
  Max Rothman committed Feb 20, 2015
  58e7037f Browse Files
- Add newer roles to sandbox play · cef9193d
  Max Rothman committed Feb 20, 2015
  
  cef9193d Browse Files
- Fix edxlocal analytics-api db reference per refactor · 400723d7
  Max Rothman committed Feb 20, 2015
  
  400723d7 Browse Files
- Merge pull request #1863 from edx/max/fix-xqwatcher-checkout-user · 0f71983c
```
Fix xqwatcher checking out code as wrong user
```
  Max Rothman committed Feb 20, 2015
  0f71983c Browse Files
- Fix xqwatcher checking out code as wrong user · 14fe58fa
  Max Rothman committed Feb 20, 2015
  
  14fe58fa Browse Files
- Merge pull request #1859 from edx/db/birch-upgrade-scripts · 4c9f8db0
```
Add a migration script for Birch
```
  David Baumgold committed Feb 20, 2015
  4c9f8db0 Browse Files
- Add a migration script for Birch · e5869004
  David Baumgold committed Feb 20, 2015
  
  e5869004 Browse Files
- Merge pull request #1862 from edx/arbab/country-access-setting · 9eafccb2
```
ENABLE COUNTRY ACCESS
```
  Arbab Nazar committed Feb 20, 2015
  9eafccb2 Browse Files
- ENABLE COUNTRY ACCESS · ffc229e0
  arbabnazar committed Feb 20, 2015
  
  ffc229e0 Browse Files
19 Feb, 2015 10 commits
- xqwatcher fixes · ea96ee50
  Max Rothman committed Feb 19, 2015
  
  ea96ee50 Browse Files
- Merge pull request #1860 from edx/e0d/update-mtu · d01bfcd5
```
update mtu
```
  Edward Zarecor committed Feb 19, 2015
  d01bfcd5 Browse Files
- Restart does not work · 6db00d84
  Edward Zarecor committed Feb 19, 2015
  
  6db00d84 Browse Files
- update mtu · 33361645
  Edward Zarecor committed Feb 19, 2015
  
  33361645 Browse Files
- Merge pull request #1858 from edx/feanil/insights_api · b5f932a1
```
Add a new insights setting.
```
  Feanil Patel committed Feb 19, 2015
  b5f932a1 Browse Files
- Add a new insights setting. · ad774f1d
  Feanil Patel committed Feb 19, 2015
  
  ad774f1d Browse Files
- Merge pull request #1849 from riccardomurri/patch-1 · faf20ead
```
Update AUTHORS
```
  Sarina Canelake committed Feb 19, 2015
  faf20ead Browse Files
- Merge pull request #1857 from edx/feanil/cors_whitelist · 8a1135ae
```
Add defaults for CORS related django settings that can be overwritten.
```
  Feanil Patel committed Feb 19, 2015
  8a1135ae Browse Files
- Update AUTHORS · 5e904b34
```
Add myself to the AUTHORS list, as per "contributing" instructions.
```
  Riccardo Murri committed Feb 19, 2015
  5e904b34 Browse Files
- Add defaults for CORS related django settings that can be overwritten. · 71a18953
  Feanil Patel committed Feb 19, 2015
  
  71a18953 Browse Files
18 Feb, 2015 4 commits
- Merge pull request #1852 from edx/insights-update · 7ba4277c
```
Updated Location of Insights manage.py
```
  Clinton Blackburn committed Feb 18, 2015
  7ba4277c Browse Files
- Merge pull request #1856 from edx/clytwynec/temporarily-revert-pip-accel-for-jenkins-workers · 4029fba2
```
use pip instead of pip-accel for jenkins workers
```
  Christine Lytwynec committed Feb 18, 2015
  4029fba2 Browse Files
- Don't ask for input · 9205dcae
  Edward Zarecor committed Feb 18, 2015
  
  9205dcae Browse Files
- use pip instead of pip-accel for jenkins workers · 0e90e04f
  Christine Lytwynec committed Feb 18, 2015
  
  0e90e04f Browse Files
17 Feb, 2015 14 commits
- Port git-prune fix into edxapp · 9db01dc4
  Max Rothman committed Feb 17, 2015
  
  9db01dc4 Browse Files
- Merge pull request #1855 from edx/max/refactor-fixes · 6da201a5
```
Small doc fix
```
  Max Rothman committed Feb 17, 2015
  6da201a5 Browse Files
- Small doc fix · b08a80b0
  Max Rothman committed Feb 17, 2015
  
  b08a80b0 Browse Files
- Merge pull request #1854 from edx/max/refactor-fixes · a797b2cf
```
A few small fixes
```
  Max Rothman committed Feb 17, 2015
  a797b2cf Browse Files
- Restart edx_notes_api at the end · 14bbda74
  Max Rothman committed Feb 17, 2015
  
  14bbda74 Browse Files
- Updated Location of Insights manage.py · 555f9387
  Clinton Blackburn committed Feb 17, 2015
  
  555f9387 Browse Files
- Make package input to edx_service explicit · 38c8237a
  Max Rothman committed Feb 17, 2015
  
  38c8237a Browse Files
- Roles don't have dashes in their names anymore, so no point in converting · 818243ca
  Max Rothman committed Feb 17, 2015
  
  818243ca Browse Files
- Merge pull request #1847 from edx/max/refactor-minos · 17be6b20
```
refactor minos to use new edx_service role
```
  Max Rothman committed Feb 17, 2015
  17be6b20 Browse Files
- Merge pull request #1846 from edx/max/refactor-xqwatcher · 63565290
```
Refactor xqwatcher for edx_service
```
  Max Rothman committed Feb 17, 2015
  63565290 Browse Files
- Merge pull request #1851 from edx/re-add-birch-rcs · 0b6af757
```
Re-add Birch RCs
```
  David Baumgold committed Feb 17, 2015
  0b6af757 Browse Files
- I'm not sure how these lines got removed, but I'm re-adding them · 05beac32
  David Baumgold committed Feb 17, 2015
  
  05beac32 Browse Files
- Merge pull request #1786 from edx/arbab/termination-as-motd · c6bb5bee
```
added the termination date and time as motd
```
  Arbab Nazar committed Feb 17, 2015
  c6bb5bee Browse Files
- added the termination date and time as motd · ea57ad51
```
added the edx-sandbox role

Added the ddx-sandbox role and delete the previously added task from
the common role and add it to this separate role

take the date & time from tag

add the full template path

Add the exception handling

modified the motd script

modified the motd script

modified the motd script
```
  arbabnazar committed Feb 17, 2015
  ea57ad51 Browse Files
13 Feb, 2015 3 commits
- Use MINOS_GIT_IDENTITY, not COMMON_ · b7c9e1b1
  Max Rothman committed Feb 13, 2015
  
  b7c9e1b1 Browse Files
- Remove handlers · ac2699dc
  Max Rothman committed Feb 13, 2015
  
  ac2699dc Browse Files
- remove venv assumptions · 6c00f6f0
  Max Rothman committed Feb 13, 2015
  
  6c00f6f0 Browse Files