Commits · aacdfe06910b1ab4bd3b930b6bce5a22e5ab1f9f · OATS-CADC / ac · GitLab

Aug 25, 2015
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · aacdfe06
  Jeff Burke authored Aug 25, 2015
  
  aacdfe06
Aug 21, 2015
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · 7ddf0c85
  Alinga Yeung authored Aug 21, 2015
  
  7ddf0c85
- ac2 - merged master into ac2 (opencadc) · 7cd238e5
  Brian Major authored Aug 21, 2015
  
  7cd238e5
Aug 20, 2015
- Story ac2. Fixed merge conflicts. · e304de55
  Alinga Yeung authored Aug 20, 2015
  
  e304de55
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 3c2995a2
  Jeff Burke authored Aug 20, 2015
  3c2995a2
Aug 19, 2015
- Merged with s1657 · 9a86389e
  Adrian Damian authored Aug 19, 2015
  
  9a86389e
- Merged with ac2 · 42193470
  Adrian Damian authored Aug 19, 2015
  
  42193470
Aug 07, 2015
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · e510044e
  Alinga Yeung authored Aug 07, 2015
  
  e510044e
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · d3aea657
  Brian Major authored Aug 07, 2015
  
  d3aea657
- ac2 - changed realm to use username param, not userid · beadd316
  Brian Major authored Aug 07, 2015
  
  beadd316
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · c3580b2a
  Alinga Yeung authored Aug 06, 2015
  
  c3580b2a
Aug 05, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 6f556c31
  Brian Major authored Aug 05, 2015
  
  6f556c31
- ac2 - LogControlServlet does a group check for authorization · c6cda818
  Brian Major authored Aug 05, 2015
  
  c6cda818
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 3d08108a
  Brian Major authored Aug 05, 2015
  
  3d08108a
- ac2 - restored cadcTomcat SSL work--ported to tomcat 7 · 7a639d06
  Brian Major authored Aug 05, 2015
  
  7a639d06
Aug 04, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 59aedba7
  Brian Major authored Aug 04, 2015
  
  59aedba7
- s1729 - Tomcat realm tests · c51de95c
  Brian Major authored Aug 04, 2015
  
  c51de95c
Aug 02, 2015
- Merge branch 'ac2' into s1657 · 7e896c75
  Adrian Damian authored Aug 02, 2015
  
  7e896c75
Jul 31, 2015
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · 1cae44b0
  Alinga Yeung authored Jul 31, 2015
  
  1cae44b0
- s1729 - post params in body, not url · 52a4b880
  Brian Major authored Jul 31, 2015
  
  52a4b880
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · e0b7c5e3
  Brian Major authored Jul 31, 2015
  
  e0b7c5e3
- s1729 - Initial version of cadc ldap authentication realm · bb1d0b33
  Brian Major authored Jul 31, 2015
  
  bb1d0b33
Jul 30, 2015
- Story 1731 ac2. Fixed merge conflicts. · da98ede5
  Alinga Yeung authored Jul 30, 2015
  
  da98ede5
Jul 28, 2015
- Merge branch 'ac2' of ssh://gimli2:/srv/cadc/git/wopencadc into ac2 · 9734fe19
  Brian Major authored Jul 28, 2015
  
  9734fe19
- ac - reinstated cadcTomcat for custom realm implementation · 614a2069
  Brian Major authored Jul 28, 2015
  
  614a2069
Jul 24, 2015
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 53b8297f
  Jeff Burke authored Jul 24, 2015
  53b8297f
Jul 23, 2015
- ac2 removed deprecated project cadcTomcat · 132b99bd
  Brian Major authored Jul 23, 2015
  
  132b99bd
Aug 28, 2013
- Merging t35230 to installed for push to beta. · 3bb1201e
  CADC Software Admin--S.Gaudet authored Aug 28, 2013
  
  3bb1201e
Aug 27, 2013
- Merging s1367 to installed for push to beta. · 843b804d
  CADC Software Admin--S.Gaudet authored Aug 27, 2013
  
  843b804d
- Merging s1367 to installed for push to beta. · 04e6bbbb
  CADC Software Admin--S.Gaudet authored Aug 27, 2013
  
  04e6bbbb
- Merge branch 'master' of /srv/cadc/git/wopencadc into s1367 · 4bdd0345
  Dustin Jenkins authored Aug 27, 2013
  
  4bdd0345
Aug 21, 2013
- Merge branch 's1386' into installed · 56dc8efa
  CADC Software Admin--S.Gaudet authored Aug 21, 2013
  
  56dc8efa
- Merge branch 'master' into installed · 724312b3
  CADC Software Admin--S.Gaudet authored Aug 21, 2013
  
  724312b3
Aug 13, 2013
- Story 1367: Merge in installed branch. · 5aa3ee10
  Dustin Jenkins authored Aug 13, 2013
  
  5aa3ee10
- Merge branch 'master' into installed · 1001131d
  CADC Software Admin--S.Gaudet authored Aug 13, 2013
  
  1001131d
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into s1367 · 125b1fbf
  Dustin Jenkins authored Aug 13, 2013
  
  125b1fbf
Aug 09, 2013
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc · affef8d0
  Dustin Jenkins authored Aug 09, 2013
  
  affef8d0
Aug 01, 2013
- Merge branch 'CLF' into installed · 8f8dfd64
  CADC Software Admin--S.Gaudet authored Aug 01, 2013
  
  8f8dfd64
- Merge branch 'master' into installed · d0679bba
  CADC Software Admin--S.Gaudet authored Aug 01, 2013
  
  d0679bba
Jul 26, 2013
- Merge branch 'master' of /srv/cadc/git/wopencadc · ed0fccaf
  Jeff Burke authored Jul 26, 2013
  
  ed0fccaf