Commits · dc5ada149931daed3ac4544fcf75fbd2f3107387 · OATS-CADC / ac

Dec 16, 2015
- split and reorg · dc5ada14
  Patrick Dowler authored Dec 16, 2015
  
  dc5ada14
Nov 30, 2015
- Merge branch 'release_candidate' · b6a7910d
  CADC Software Admin authored Nov 30, 2015
  
  b6a7910d
Nov 27, 2015
- Merge branch 'ac2-aci' into release_candidate · 20b21c0e
  CADC Software Admin authored Nov 27, 2015
  
  20b21c0e
- Merge branch 'ac2-aci' into release_candidate · 7cbe44c4
  CADC Software Admin authored Nov 27, 2015
  
  7cbe44c4
Nov 26, 2015
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into ac2-aci · 6f53e997
  Patrick Dowler authored Nov 25, 2015
  
  6f53e997
- Merge branch 'release_candidate' · 50ca4405
  CADC Software Admin authored Nov 25, 2015
  
  50ca4405
Nov 13, 2015
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · b5dd9de3
  Patrick Dowler authored Nov 12, 2015
  
  b5dd9de3
Nov 12, 2015
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 6d0c443c
  Patrick Dowler authored Nov 12, 2015
```
Conflicts:
	projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java
```
  6d0c443c
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · cc239cad
  Patrick Dowler authored Nov 12, 2015
```
Conflicts:
	projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java
```
  cc239cad
Nov 02, 2015
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 41c75fa8
  Jeff Burke authored Nov 02, 2015
  
  41c75fa8
Oct 23, 2015
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 1875fed2
  Jeff Burke authored Oct 23, 2015
  
  1875fed2
Oct 21, 2015
- Merge branch 's1848' into ac2 · d08eee2a
  Dustin Jenkins authored Oct 21, 2015
  
  d08eee2a
- Merge branch 'master' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 7db2ceea
  Dustin Jenkins authored Oct 21, 2015
  
  7db2ceea
Oct 15, 2015
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 9ace7071
  Jeff Burke authored Oct 15, 2015
  
  9ace7071
- ac2 - merged in CDP changes · e421e8fc
  Brian Major authored Oct 15, 2015
  
  e421e8fc
Oct 09, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 1ece4a6d
  Brian Major authored Oct 09, 2015
  
  1ece4a6d
Oct 08, 2015
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 263874a9
  Jeff Burke authored Oct 08, 2015
  
  263874a9
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 002f996d
  Brian Major authored Oct 08, 2015
  
  002f996d
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 8bff8bdf
  Patrick Dowler authored Oct 08, 2015
  
  8bff8bdf
Oct 02, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 0389e3db
  Brian Major authored Oct 02, 2015
  
  0389e3db
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · c7c1a36c
  Patrick Dowler authored Oct 02, 2015
  
  c7c1a36c
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · eae10e13
  Patrick Dowler authored Oct 02, 2015
  
  eae10e13
- Merge branch 'master' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 4860c289
  Brian Major authored Oct 02, 2015
  
  4860c289
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · a2be6139
  Brian Major authored Oct 02, 2015
  
  a2be6139
Oct 01, 2015
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · 9f7f8d58
  Brian Major authored Oct 01, 2015
  
  9f7f8d58
Sep 30, 2015
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · 649504f9
  Brian Major authored Sep 30, 2015
  
  649504f9
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 219f32b8
  Brian Major authored Sep 30, 2015
  
  219f32b8
Sep 29, 2015
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · e115d2d5
  Brian Major authored Sep 29, 2015
  
  e115d2d5
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 8085e389
  Patrick Dowler authored Sep 29, 2015
  
  8085e389
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · da28518a
  Brian Major authored Sep 29, 2015
  
  da28518a
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 5ca39a69
  Patrick Dowler authored Sep 29, 2015
  
  5ca39a69
Sep 28, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 6ee76de5
  Brian Major authored Sep 28, 2015
  
  6ee76de5
Sep 24, 2015
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · 1fdf7a38
  Brian Major authored Sep 24, 2015
  
  1fdf7a38
Sep 18, 2015

Merge branch 'ac2' into s1840 · 6787497a

Jeff Burke authored Sep 18, 2015

Conflicts:
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java

6787497a

Sep 15, 2015
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 465f1638
  Patrick Dowler authored Sep 15, 2015
  
  465f1638
- 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
```
Conflicts:
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
```
  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