Commits · 6ce4bdb843ed2a09883c9eca00295bc3b72942c1 · OATS-CADC / ac · GitLab

Nov 28, 2014
- Merge branch 'master' of /srv/cadc/git/wopencadc into s1645 · 6ce4bdb8
  Dustin Jenkins authored Nov 28, 2014
  
  6ce4bdb8
Nov 26, 2014
- Merge branch 'nep110' into release_candidate · bbede348
  CADC Software Admin--S.Gaudet authored Nov 26, 2014
  
  bbede348
Nov 25, 2014
- Merge branch 'master' of /srv/cadc/git/wopencadc into s1645 · 6248edea
  Dustin Jenkins authored Nov 25, 2014
  
  6248edea
- Merge branch 'nep110' into release_candidate · dbd69bff
  CADC Software Admin--S.Gaudet authored Nov 25, 2014
  
  dbd69bff
- Merge branch 'nep110' of /srv/cadc/git/wopencadc into nep110 · 3f7e028a
  Patrick Dowler authored Nov 25, 2014
  
  3f7e028a
- Merge branch 'master' of /srv/cadc/git/wopencadc into nep110 · f3204d60
  Patrick Dowler authored Nov 25, 2014
  
  f3204d60
Nov 21, 2014
- Fixed a problem with member groups · fcd9bc98
  Adrian Damian authored Nov 21, 2014
  
  fcd9bc98
Nov 20, 2014
- Fixed bug · 4c72ca86
  Adrian Damian authored Nov 19, 2014
  
  4c72ca86
Nov 19, 2014
- Filter out deleted groups from members or admins in getGroup · f242ef77
  Adrian Damian authored Nov 19, 2014
  
  f242ef77
- Fixed duplicate users in the list · ba4efbce
  Adrian Damian authored Nov 19, 2014
  
  ba4efbce
- Merge branch 's1666' of /srv/cadc/git/wopencadc into s1705 · 8eb2cf18
  Dustin Jenkins authored Nov 19, 2014
  
  8eb2cf18
Nov 18, 2014
- nep110 - restored following redirect on group update · 83144b0c
  Brian Major authored Nov 18, 2014
  
  83144b0c
Nov 17, 2014
- nep110 - Rework: actions don't get persistent member objects before group update · 9db00f37
  Brian Major authored Nov 17, 2014
  
  9db00f37
Nov 13, 2014
- Merge branch 'nep110' of /srv/cadc/git/wopencadc into nep110 · 5baae280
  Brian Major authored Nov 13, 2014
  
  5baae280
- nep110 - more in debug mode for ac web service · aaa78696
  Brian Major authored Nov 13, 2014
  
  aaa78696
Nov 12, 2014
- Merge branch 'nep110' of /srv/cadc/git/wopencadc into s1689 · 7c85261d
  Patrick Dowler authored Nov 12, 2014
  
  7c85261d
- nep110 - added logging to LdapDAO tests · 06a8f00d
  Brian Major authored Nov 12, 2014
  
  06a8f00d
- Merge branch 'nep110' of /srv/cadc/git/wopencadc into s1689 · a590f423
  Patrick Dowler authored Nov 12, 2014
  
  a590f423
Nov 11, 2014
- Merge branch 's1668' of /srv/cadc/git/wopencadc into nep110 · d495d782
  Brian Major authored Nov 10, 2014
  
  d495d782
- nep110 - merged in branch s1682 · af0e4f5b
  Brian Major authored Nov 10, 2014
  
  af0e4f5b
Nov 10, 2014
- Merge branch 'nep110' into s1689 · f3b6172c
  Patrick Dowler authored Nov 10, 2014
  
  f3b6172c
Nov 07, 2014
- Merge branch 's1682' of mach275:/data/local/pdowler/dev/opencadc into s1682 · 8028b3bb
  Brian Major authored Nov 07, 2014
  
  8028b3bb
- Merge branch 's1666' of /srv/cadc/git/wopencadc into nep110 · 34642069
  Dustin Jenkins authored Nov 07, 2014
  
  34642069
- Merge branch 's1666' of /srv/cadc/git/wopencadc into nep110 · d7679ba8
  Dustin Jenkins authored Nov 07, 2014
  
  d7679ba8
- Merge branch 'master' of /srv/cadc/git/wopencadc into nep110 · 056d77c3
  Dustin Jenkins authored Nov 07, 2014
  
  056d77c3
- Merge branch 's1689' of /srv/cadc/git/wopencadc into s1689 · c14b8de3
  Patrick Dowler authored Nov 07, 2014
  
  c14b8de3
- Merge branch 'master' of /srv/cadc/git/wopencadc into s1689 · 920b0f13
  Patrick Dowler authored Nov 07, 2014
  
  920b0f13
Nov 06, 2014
- Merge branch 's1689' of /srv/cadc/git/wopencadc into s1689 · c7d641a9
  Brian Major authored Nov 06, 2014
  
  c7d641a9
- Merge branch 's1689' of /srv/cadc/git/wopencadc into s1689 · 434b3bf6
  Brian Major authored Nov 06, 2014
  
  434b3bf6
- Merge branch 's1706' into release_candidate · 640aaa8a
  CADC Software Admin--S.Gaudet authored Nov 06, 2014
  
  640aaa8a
- Merge branch 's1711' of /srv/cadc/git/wopencadc into s1666 · ec7b73c3
  Dustin Jenkins authored Nov 06, 2014
  
  ec7b73c3
Nov 05, 2014
- Merge branch 'nep110' of /srv/cadc/git/wopencadc into s1668 · 336233b6
  Patrick Dowler authored Nov 05, 2014
  
  336233b6
- Merge branch 'nep110' of /srv/cadc/git/wopencadc into s1711 · cb0dfe64
  Dustin Jenkins authored Nov 05, 2014
  
  cb0dfe64
Nov 04, 2014
- s1711: updated unit test · ac715d75
  Jeff Burke authored Nov 04, 2014
  
  ac715d75
- Merge branch 's1689' of /srv/cadc/git/wopencadc into s1689 · 44c925d7
  Patrick Dowler authored Nov 04, 2014
  
  44c925d7
- s1711 - Removed CSV data transfer - it was causing AJP/output stream mixing · 72877d86
  Brian Major authored Nov 04, 2014
  
  72877d86
- Merge branch 's1711' of ssh://mach16/srv/cadc/git/wopencadc into s1711 · d14b38a6
  Jeff Burke authored Nov 04, 2014
```
Conflicts:
	projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/GetGroupNamesActionTest.java
```
  d14b38a6
- s1711: updated LdapConfig and unit tests · 9348bed4
  Jeff Burke authored Nov 04, 2014
  
  9348bed4
- Merge branch 'nep110' into s1689 · 9027879d
  Adrian Damian authored Nov 04, 2014
  
  9027879d
- Merge branch 'master' into s1689 · 0c3e658f
  Adrian Damian authored Nov 04, 2014
  
  0c3e658f