Commits · 3efae7024826a9ef11579811c76a86a529e8dd85 · OATS-CADC / cdp · GitLab

Dec 14, 2015
- split and reorg · 3efae702
  Patrick Dowler authored Dec 14, 2015
  
  3efae702
Nov 30, 2015
- Merge branch 'release_candidate' · 95ee5570
  CADC Software Admin authored Nov 30, 2015
  
  95ee5570
Nov 27, 2015
- Merge branch 'ac2-aci' into release_candidate · 94fb8390
  CADC Software Admin authored Nov 27, 2015
  
  94fb8390
- Merge branch 'ac2-aci' into release_candidate · fff547b1
  CADC Software Admin authored Nov 27, 2015
  
  fff547b1
Nov 26, 2015
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into ac2-aci · 6478c26a
  Patrick Dowler authored Nov 25, 2015
  
  6478c26a
- Merge branch 'release_candidate' · 6777d155
  CADC Software Admin authored Nov 25, 2015
  
  6777d155
Nov 13, 2015
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 098cbee2
  Patrick Dowler authored Nov 12, 2015
  
  098cbee2
Nov 12, 2015
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · eb6fba69
  Patrick Dowler authored Nov 12, 2015
```
Conflicts:
	projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java
```
  eb6fba69
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · ae765ef0
  Patrick Dowler authored Nov 12, 2015
```
Conflicts:
	projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java
```
  ae765ef0
Nov 02, 2015
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 9ddb111a
  Jeff Burke authored Nov 02, 2015
  
  9ddb111a
Oct 23, 2015
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 14fce886
  Jeff Burke authored Oct 23, 2015
  
  14fce886
Oct 21, 2015
- Merge branch 's1848' into ac2 · fb839bab
  Dustin Jenkins authored Oct 21, 2015
  
  fb839bab
- Merge branch 'master' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · f78b6ce0
  Dustin Jenkins authored Oct 21, 2015
  
  f78b6ce0
Oct 20, 2015

set max proxy cert lifetime to 30 days; changed get proxy cert to truncate... · 4654cbbf

Patrick Dowler authored Oct 20, 2015

set max proxy cert lifetime to 30 days; changed get proxy cert to truncate requested lifetime to configured max for trusted principals

4654cbbf

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