Commits · ec83b5fe18bd4a01e8ce3b0059b1f0b4115d942c · OATS-CADC / cdp

Oct 16, 2015
- Story 1848: Fix for tests and updated JSON Output. · ec83b5fe
  Dustin Jenkins authored Oct 16, 2015
  
  ec83b5fe
Oct 15, 2015
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 2e05b2a1
  Jeff Burke authored Oct 15, 2015
  
  2e05b2a1
- ac2 - merged in CDP changes · 068baf91
  Brian Major authored Oct 15, 2015
  
  068baf91
Oct 09, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 451a2b70
  Brian Major authored Oct 09, 2015
  
  451a2b70
- s1795 rework · 9d349167
  Patrick Dowler authored Oct 09, 2015
  
  9d349167
Oct 08, 2015
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into s1795 · 8f5de096
  Patrick Dowler authored Oct 08, 2015
  
  8f5de096
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · a55a7f70
  Jeff Burke authored Oct 08, 2015
  
  a55a7f70
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 5700b733
  Brian Major authored Oct 08, 2015
  
  5700b733
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 34a17a13
  Patrick Dowler authored Oct 08, 2015
  
  34a17a13
Oct 05, 2015
- dded copyright comment where missing; renamed client wrapper script · 765330f7
  Patrick Dowler authored Oct 05, 2015
  
  765330f7
Oct 02, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 11c2769c
  Brian Major authored Oct 02, 2015
  
  11c2769c
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 97e7b57c
  Patrick Dowler authored Oct 02, 2015
  
  97e7b57c
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · cea5a792
  Patrick Dowler authored Oct 02, 2015
  
  cea5a792
- Merge branch 'master' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 9079be31
  Brian Major authored Oct 02, 2015
  
  9079be31
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · 0be280b6
  Brian Major authored Oct 02, 2015
  
  0be280b6
Oct 01, 2015
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · a41650fd
  Brian Major authored Oct 01, 2015
  
  a41650fd
- Merge branch 'master' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into s1750 · 301ee6ce
  Dustin Jenkins authored Oct 01, 2015
  
  301ee6ce
Sep 30, 2015
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · 40d111b7
  Brian Major authored Sep 30, 2015
  
  40d111b7
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · b61257fe
  Brian Major authored Sep 30, 2015
  
  b61257fe
Sep 29, 2015
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · 9de536ae
  Brian Major authored Sep 29, 2015
  
  9de536ae
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 84be0e52
  Patrick Dowler authored Sep 29, 2015
  
  84be0e52
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · 44c07fca
  Brian Major authored Sep 29, 2015
  
  44c07fca
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 6815082d
  Patrick Dowler authored Sep 29, 2015
  
  6815082d
Sep 28, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 72ee2b13
  Brian Major authored Sep 28, 2015
  
  72ee2b13
Sep 24, 2015
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · 8767a710
  Brian Major authored Sep 24, 2015
  
  8767a710
- changed putSignedCert to accept a chain · 8d458218
  Patrick Dowler authored Sep 24, 2015
  
  8d458218
Sep 23, 2015
- added ResourceNotFoundException and modified cred APIs to use it · 4d054735
  Patrick Dowler authored Sep 23, 2015
  
  4d054735
Sep 22, 2015
- fix default daysValid value to avoid NPE · b70dbb92
  Patrick Dowler authored Sep 22, 2015
  
  b70dbb92
- tidy up and simplify new CDP registry entries; add explicit Subject.doAs when... · a6d66f76
  Patrick Dowler authored Sep 22, 2015
```
tidy up and simplify new CDP registry entries; add explicit Subject.doAs when VOSpaceAuthorizer calls CredClient
```
  a6d66f76
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into s1795 · c99238e8
  Patrick Dowler authored Sep 22, 2015
  
  c99238e8
- moved tests from internaql code; made CertificateDAO configurable via... · 67c54b55
  Patrick Dowler authored Sep 22, 2015
```
moved tests from internaql code; made CertificateDAO configurable via constructor args; fixed CredClient to put daysValid as param
```
  67c54b55
Sep 21, 2015

moved ost of the internal code to cadcCDP-Server and re-org packages; made... · 08a0e1aa

Patrick Dowler authored Sep 21, 2015

moved ost of the internal code to cadcCDP-Server and re-org packages; made CredClient able to perform both CDP and get-proxy-cert actions

08a0e1aa

Sep 18, 2015
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into s1795 · aa1e024d
  Patrick Dowler authored Sep 18, 2015
  
  aa1e024d
- Merge branch 'ac2' into s1840 · c97b3880
  Jeff Burke authored Sep 18, 2015
```
Conflicts:
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
```
  c97b3880
Sep 15, 2015
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 4e2e4370
  Patrick Dowler authored Sep 15, 2015
  
  4e2e4370
- Merge branch 's1840' into ac2 · 5f9e2fa3
  Jeff Burke authored Sep 15, 2015
  
  5f9e2fa3
- Merge branch 's1840' into ac2 · 340cc966
  Jeff Burke authored Sep 14, 2015
```
Conflicts:
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
```
  340cc966
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 9716c515
  Jeff Burke authored Sep 14, 2015
  
  9716c515
Sep 14, 2015
- initial commit for cadcCDP-Server module with cdoe from org.astrogrid.security.delegation library · 0799f1f7
  Patrick Dowler authored Sep 14, 2015
  
  0799f1f7
Sep 11, 2015
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc · 574aa003
  Sharon authored Sep 11, 2015
  
  574aa003