Commits · d7679ba895d01c25c21d989266e66c75848bc8d9 · OATS-CADC / ac · GitLab

Snippets Groups Projects

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