Commits · 34642069490dd7405b4b74baaad4e81fc578ba7e · OATS-CADC / ac · GitLab

Nov 07, 2014
- Merge branch 's1666' of /srv/cadc/git/wopencadc into nep110 · 34642069
  Dustin Jenkins authored Nov 07, 2014
  
  34642069
- Merge branch 's1666' of /srv/cadc/git/wopencadc into nep110 · d7679ba8
  Dustin Jenkins authored Nov 07, 2014
  
  d7679ba8
- Merge branch 'master' of /srv/cadc/git/wopencadc into nep110 · 056d77c3
  Dustin Jenkins authored Nov 07, 2014
  
  056d77c3
Nov 06, 2014
- Merge branch 's1706' into release_candidate · 640aaa8a
  CADC Software Admin--S.Gaudet authored Nov 06, 2014
  
  640aaa8a
- Merge branch 's1711' of /srv/cadc/git/wopencadc into s1666 · ec7b73c3
  Dustin Jenkins authored Nov 06, 2014
  
  ec7b73c3
Nov 05, 2014
- Merge branch 'nep110' of /srv/cadc/git/wopencadc into s1711 · cb0dfe64
  Dustin Jenkins authored Nov 05, 2014
  
  cb0dfe64
Nov 04, 2014
- s1711: updated unit test · ac715d75
  Jeff Burke authored Nov 04, 2014
  
  ac715d75
- s1711 - Removed CSV data transfer - it was causing AJP/output stream mixing · 72877d86
  Brian Major authored Nov 04, 2014
  
  72877d86
- Merge branch 's1711' of ssh://mach16/srv/cadc/git/wopencadc into s1711 · d14b38a6
  Jeff Burke authored Nov 04, 2014
```
Conflicts:
	projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/GetGroupNamesActionTest.java
```
  d14b38a6
- s1711: updated LdapConfig and unit tests · 9348bed4
  Jeff Burke authored Nov 04, 2014
  
  9348bed4
Nov 03, 2014
- Merge branch 'nep110' of /srv/cadc/git/wopencadc into s1666 · f4de26b3
  Dustin Jenkins authored Nov 03, 2014
  
  f4de26b3
- Merge branch 's1666' of /srv/cadc/git/wopencadc into s1666 · 8f4c7a38
  Dustin Jenkins authored Nov 03, 2014
  
  8f4c7a38
- Merge branch 's1711' of /srv/cadc/git/wopencadc into s1711 · 37f8f497
  Brian Major authored Nov 03, 2014
  
  37f8f497
- s1711 - Minor logging changes · 61a7b7bc
  Brian Major authored Nov 03, 2014
  
  61a7b7bc
- Story 1711: Test fixes. · 1e04878b
  Dustin Jenkins authored Nov 03, 2014
  
  1e04878b
- Merge branch 's1711' of /srv/cadc/git/wopencadc into s1711 · 4ff1fd4d
  Brian Major authored Nov 03, 2014
  
  4ff1fd4d
- Fixed some unit tests · fe89c476
  Adrian Damian authored Nov 03, 2014
  
  fe89c476
Oct 31, 2014
- Story 1711: Fixes. · e3cd6903
  Dustin Jenkins authored Oct 31, 2014
  
  e3cd6903
- Merge branch 's1711' of /srv/cadc/git/wopencadc into s1711 · cdbeff2d
  Dustin Jenkins authored Oct 31, 2014
  
  cdbeff2d
- Added check if group exists · a1739694
  Adrian Damian authored Oct 31, 2014
  
  a1739694
- Small fix for integration testing · 47274109
  Adrian Damian authored Oct 31, 2014
  
  47274109
- Merge branch 's1668' of /srv/cadc/git/wopencadc into s1711 · 3477988f
  Dustin Jenkins authored Oct 31, 2014
  
  3477988f
Oct 30, 2014
- Temporary fix integration testing · cec1067f
  Adrian Damian authored Oct 30, 2014
  
  cec1067f
- Merge branch 'nep110' of /srv/cadc/git/wopencadc into nep110 · cabe2580
  Brian Major authored Oct 30, 2014
  
  cabe2580
- Small change in logging · 19738385
  Adrian Damian authored Oct 30, 2014
  
  19738385
- Merge branch 's1666' into s1711 · 6957200d
  Adrian Damian authored Oct 30, 2014
  
  6957200d
- s1666: fixed CsvReader handling group names · a10a124d
  Jeff Burke authored Oct 30, 2014
  
  a10a124d
- Fixed unit testing · 73d8f195
  Adrian Damian authored Oct 30, 2014
  
  73d8f195
- Merge branch 's1711' of /srv/cadc/git/wopencadc into s1711 · f64bbc4f
  Adrian Damian authored Oct 30, 2014
  
  f64bbc4f
- Removed test user password from unit test files. · d64d22ff
  Adrian Damian authored Oct 30, 2014
  
  d64d22ff
- check that subject did not change since creating SSLSocketFactory in GMS... · a0efe6ae
  Patrick Dowler authored Oct 30, 2014
```
check that subject did not change since creating SSLSocketFactory in GMS clients, change VOSpaceAuthorizer to call both CADC and CANFAR GMS services
```
  a0efe6ae
Oct 29, 2014
- Merge branch 's1666' of /srv/cadc/git/wopencadc into s1711 · dd38d8db
  Dustin Jenkins authored Oct 29, 2014
  
  dd38d8db
- s1666: bug fixes and updated unit tests · 057c890f
  Jeff Burke authored Oct 29, 2014
  
  057c890f
- Merged with origin · 18d3ac66
  Adrian Damian authored Oct 29, 2014
  
  18d3ac66
- Changed LdapConfig in a properties file to be found in ~/config/ · e3f1ab09
  Adrian Damian authored Oct 29, 2014
  
  e3f1ab09
- Merge branch 's1711' of /srv/cadc/git/wopencadc into s1666 · d7f30f6f
  Dustin Jenkins authored Oct 29, 2014
  
  d7f30f6f
- Story 1711: Fix for TLS. · ca3a1499
  Dustin Jenkins authored Oct 29, 2014
  
  ca3a1499
- Merge branch 'nep110' of /srv/cadc/git/wopencadc into s1711 · d4eb2bf3
  Dustin Jenkins authored Oct 29, 2014
  
  d4eb2bf3
Oct 28, 2014
- Merge branch 's1666' into s1711 · 82b45a08
  Adrian Damian authored Oct 28, 2014
  
  82b45a08
- Merge branch 's1666' of ssh://mach16/srv/cadc/git/wopencadc into s1666 · 9441f331
  Jeff Burke authored Oct 28, 2014
  
  9441f331