Commits · 4ff1fd4d06227ef1c43bf07c0da270e4d33c0fb7 · OATS-CADC / ac

Nov 03, 2014
- 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
- 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
- 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
- s1666: updated GroupDAO unit tests · 166e816e
  Jeff Burke authored Oct 28, 2014
  
  166e816e
- Merge branch 'nep110' of /srv/cadc/git/wopencadc into nep110 · 14662ab5
  Patrick Dowler authored Oct 28, 2014
  
  14662ab5
- Merge branch 'nep110' into s1668 · 4c09aa32
  Sharon Goliath authored Oct 28, 2014
  
  4c09aa32
- s1666: bug fixes for getGroupNames · c4bf1457
  Jeff Burke authored Oct 28, 2014
  
  c4bf1457
Oct 24, 2014
- Merge branch 'master' of /srv/cadc/git/wopencadc into s1666 · af9390c7
  Dustin Jenkins authored Oct 24, 2014
  
  af9390c7
- Story 1666: Completed merge from nep110 · dfb3ef09
  Dustin Jenkins authored Oct 24, 2014
  
  dfb3ef09
- Story 1666: Fix for Description values. · 945a9705
  Dustin Jenkins authored Oct 24, 2014
  
  945a9705
Oct 23, 2014
- nep110 - Enhanced caching test · 3f08cda6
  Brian Major authored Oct 23, 2014
  
  3f08cda6
- Merge branch 'master' of /srv/cadc/git/wopencadc · 22872d3f
  Brian Major authored Oct 23, 2014
  
  22872d3f
Oct 22, 2014
- Merge branch 'master' of /srv/cadc/git/wopencadc · 54062dee
  Patrick Dowler authored Oct 22, 2014
  
  54062dee
- Merge branch 't62652' into release_candidate · 1f064407
  CADC Software Admin--S.Gaudet authored Oct 22, 2014
  
  1f064407
- Merge branch 's1666' of ssh://mach16/srv/cadc/git/wopencadc into s1666 · 844f2c43
  Jeff Burke authored Oct 22, 2014
```
Conflicts:
	projects/cadcAccessControl-Server/build.xml
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GetGroupNamesAction.java
```
  844f2c43
- s1666: unit and int tests for listing group names · d8046963
  Jeff Burke authored Oct 22, 2014
  
  d8046963
- Story 1666: Fixes and added missing file. · ea1914e5
  Dustin Jenkins authored Oct 22, 2014
  
  ea1914e5
Oct 17, 2014
- Story 1666: Added javacsv to the classpath. · 9f4c122b
  Dustin Jenkins authored Oct 17, 2014
  
  9f4c122b
- s1666 - start of work to list all group names · 67c5adc7
  Brian Major authored Oct 17, 2014
  
  67c5adc7
Oct 16, 2014
- nep110 - Added UserNotFoundException to GMSClient update group method · d89a7a2c
  Brian Major authored Oct 16, 2014
  
  d89a7a2c