Commits · 3035782b129ea25b35c7eb2b0c3a62d275c1b8a4 · OATS-CADC / ac · GitLab

Sep 15, 2015
- Merge branch 's1840' into ac2 · 3035782b
  Jeff Burke authored Sep 15, 2015
  
  3035782b
- Merge branch 's1840' into ac2 · ff7f9699
  Jeff Burke authored Sep 14, 2015
  ff7f9699
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 86c27932
  Jeff Burke authored Sep 14, 2015
  
  86c27932
Sep 11, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 58480fa8
  Brian Major authored Sep 11, 2015
  
  58480fa8
Sep 10, 2015
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · 75a770f5
  Brian Major authored Sep 10, 2015
  
  75a770f5
- ac2 - fixed merge conflicts in AbstractExecutor, GMSClient · 0480dbe9
  Brian Major authored Sep 10, 2015
  
  0480dbe9
- Merge branch 's1840' of gimli2:/srv/cadc/git/wopencadc into s1840 · 79caa4e6
  Jeff Burke authored Sep 10, 2015
  
  79caa4e6
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · aaea8cda
  Jeff Burke authored Sep 10, 2015
  
  aaea8cda
Sep 09, 2015
- Merge branch 's1840' of /srv/cadc/git/wopencadc into s1840 · 388fac81
  Alinga Yeung authored Sep 09, 2015
  
  388fac81
- Merge branch 's1840' of /srv/cadc/git/wopencadc into s1840 · 1430b914
  Alinga Yeung authored Sep 09, 2015
  
  1430b914
- Merge branch 's1840' of /srv/cadc/git/wopencadc into s1840 · b3a830d4
  Alinga Yeung authored Sep 09, 2015
  
  b3a830d4
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · 2e820565
  Alinga Yeung authored Sep 09, 2015
  
  2e820565
- Merge branch 's1832' into ac2 · 4857ce45
  Adrian Damian authored Sep 09, 2015
  
  4857ce45
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · c25214db
  Jeff Burke authored Sep 09, 2015
  c25214db
- Merge branch 's1832' into ac2 · 6b73c7d5
  Adrian Damian authored Sep 09, 2015
  
  6b73c7d5
- Merge branch 's1832' of /srv/cadc/git/wopencadc into s1832 · d9db3a7d
  Adrian Damian authored Sep 09, 2015
  
  d9db3a7d
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into s1832 · 5b6b46d1
  Adrian Damian authored Sep 09, 2015
  
  5b6b46d1
Sep 08, 2015
- Merge branch 'ac2' into s1832 · c9e3f93c
  Adrian Damian authored Sep 08, 2015
  
  c9e3f93c
Sep 04, 2015
- Merge branch 's1832' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into s1832 · e9b5e7c6
  Dustin Jenkins authored Sep 04, 2015
  
  e9b5e7c6
Sep 03, 2015
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into s1832 · f6e6a2d2
  Adrian Damian authored Sep 03, 2015
  
  f6e6a2d2
Sep 02, 2015
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into s1832 · 4b5f1925
  Adrian Damian authored Sep 02, 2015
  
  4b5f1925
- Merged with ac2 · 9a1b17f6
  Adrian Damian authored Sep 02, 2015
  
  9a1b17f6
Aug 28, 2015
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 6fe62332
  Jeff Burke authored Aug 28, 2015
  6fe62332
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