Commits · 8767a710004d37fde5ca971df3fc56697b6765fc · OATS-CADC / cdp

Sep 24, 2015
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · 8767a710
  Brian Major authored Sep 24, 2015
  
  8767a710
Sep 18, 2015

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 11, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 24f79839
  Brian Major authored Sep 11, 2015
  
  24f79839
Sep 10, 2015
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · 9b628ae3
  Brian Major authored Sep 10, 2015
  
  9b628ae3
- ac2 - fixed merge conflicts in AbstractExecutor, GMSClient · 735ff7a4
  Brian Major authored Sep 10, 2015
  
  735ff7a4
- Merge branch 's1840' of gimli2:/srv/cadc/git/wopencadc into s1840 · 42a1fda0
  Jeff Burke authored Sep 10, 2015
  
  42a1fda0
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 7218ae83
  Jeff Burke authored Sep 10, 2015
  
  7218ae83
Sep 09, 2015
- Merge branch 's1840' of /srv/cadc/git/wopencadc into s1840 · 3f9e3104
  Alinga Yeung authored Sep 09, 2015
  
  3f9e3104
- Merge branch 's1840' of /srv/cadc/git/wopencadc into s1840 · 6eb81c37
  Alinga Yeung authored Sep 09, 2015
  
  6eb81c37
- Merge branch 's1840' of /srv/cadc/git/wopencadc into s1840 · 6bae8bee
  Alinga Yeung authored Sep 09, 2015
  
  6bae8bee
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · d849c623
  Alinga Yeung authored Sep 09, 2015
  
  d849c623
- Merge branch 's1832' into ac2 · 47b7b897
  Adrian Damian authored Sep 09, 2015
  
  47b7b897
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 9daba1c3
  Jeff Burke authored Sep 09, 2015
```
Conflicts:
	projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java
```
  9daba1c3
- Merge branch 's1832' into ac2 · 7be28a7f
  Adrian Damian authored Sep 09, 2015
  
  7be28a7f
- Merge branch 's1832' of /srv/cadc/git/wopencadc into s1832 · 8b24820a
  Adrian Damian authored Sep 09, 2015
  
  8b24820a
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into s1832 · fd72938b
  Adrian Damian authored Sep 09, 2015
  
  fd72938b
Sep 08, 2015
- Merge branch 'ac2' into s1832 · 79092f10
  Adrian Damian authored Sep 08, 2015
  
  79092f10
Sep 04, 2015
- Merge branch 's1832' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into s1832 · 6ed19ef9
  Dustin Jenkins authored Sep 04, 2015
  
  6ed19ef9
Sep 03, 2015
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into s1832 · e46a575b
  Adrian Damian authored Sep 03, 2015
  
  e46a575b
Sep 02, 2015
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into s1832 · 78cf9c1f
  Adrian Damian authored Sep 02, 2015
  
  78cf9c1f
- Merged with ac2 · 0d314235
  Adrian Damian authored Sep 02, 2015
  
  0d314235
- Story 1530: Merge with ALMA improvements. · 539aa893
  Dustin Jenkins authored Sep 02, 2015
  
  539aa893
Aug 28, 2015
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 8ddb1d15
  Jeff Burke authored Aug 28, 2015
```
Conflicts:
	projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapper.java
```
  8ddb1d15
Aug 25, 2015
- Merge branch 'master' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into s1530 · 7aea95c9
  Dustin Jenkins authored Aug 25, 2015
  
  7aea95c9
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 0f6cbf05
  Jeff Burke authored Aug 25, 2015
  
  0f6cbf05
Aug 21, 2015
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · 9f7aa2ab
  Alinga Yeung authored Aug 21, 2015
  
  9f7aa2ab
- ac2 - merged master into ac2 (opencadc) · f680c145
  Brian Major authored Aug 21, 2015
  
  f680c145
Aug 20, 2015
- Story ac2. Fixed merge conflicts. · 4299e3d3
  Alinga Yeung authored Aug 20, 2015
  
  4299e3d3
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · ca2eda9e
  Jeff Burke authored Aug 20, 2015
```
Conflicts:
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
```
  ca2eda9e
Aug 19, 2015
- Merged with s1657 · 62c6d0ef
  Adrian Damian authored Aug 19, 2015
  
  62c6d0ef
- Merged with ac2 · 771ced9a
  Adrian Damian authored Aug 19, 2015
  
  771ced9a
Aug 13, 2015
- Story 1530: Merge in t69475 · 17292ee5
  Dustin Jenkins authored Aug 13, 2015
  
  17292ee5
- Story 1530: Merge in old ALMA change. · 9e32c8be
  Dustin Jenkins authored Aug 13, 2015
  
  9e32c8be
Aug 07, 2015
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · e236d532
  Alinga Yeung authored Aug 07, 2015
  
  e236d532
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · ff033b9e
  Alinga Yeung authored Aug 06, 2015
  
  ff033b9e
Aug 04, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · d81bd74b
  Brian Major authored Aug 04, 2015
  
  d81bd74b