Commits · aa30020c9e3ce0a70d666f0ff5efd10e8f40dba8 · OATS-CADC / ac · GitLab

Oct 06, 2015
- ac2 - fixed test config typo · aa30020c
  Brian Major authored Oct 06, 2015
  
  aa30020c
- ac2 - added missed ConnectionPools.java class · 054eb78c
  Brian Major authored Oct 06, 2015
  
  054eb78c
- ac2 - connection pools refactored · 0875e2a4
  Brian Major authored Oct 06, 2015
  
  0875e2a4
Oct 02, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · e8622183
  Brian Major authored Oct 02, 2015
  
  e8622183
- ac2 - added missing test config files · d0f5cf48
  Brian Major authored Oct 02, 2015
  
  d0f5cf48
- Merge branch 'master' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 892cbcd3
  Brian Major authored Oct 02, 2015
  
  892cbcd3
- ac2 - tightened synchronized blocks in LdapConnectionPool · 733fc5c6
  Brian Major authored Oct 02, 2015
  
  733fc5c6
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · 3ef62d3b
  Brian Major authored Oct 02, 2015
  
  3ef62d3b
Oct 01, 2015
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · fa5cab35
  Brian Major authored Oct 01, 2015
  
  fa5cab35
- ac2 - Connection pool config change handling · 9ac9ef83
  Brian Major authored Oct 01, 2015
  
  9ac9ef83
- Merge branch 'master' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into s1750 · f7f5d62e
  Dustin Jenkins authored Oct 01, 2015
  
  f7f5d62e
Sep 30, 2015
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · 3bb99c3f
  Brian Major authored Sep 30, 2015
  
  3bb99c3f
- ac2 - Unit test for LdapConnections object · 979f0aa4
  Brian Major authored Sep 30, 2015
  
  979f0aa4
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · b387ff73
  Brian Major authored Sep 30, 2015
  
  b387ff73
- ac2 - fixed logging messages · b8bffe8c
  Brian Major authored Sep 30, 2015
  
  b8bffe8c
Sep 29, 2015
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · 5ba926ab
  Brian Major authored Sep 29, 2015
  
  5ba926ab
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 308bf3b4
  Patrick Dowler authored Sep 29, 2015
  
  308bf3b4
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · 7e9a4c21
  Brian Major authored Sep 29, 2015
  
  7e9a4c21
- simplified encoding of userIDs and apparently fixed a multiple-encoding bug in GMSClient · 847b25a4
  Patrick Dowler authored Sep 29, 2015
  
  847b25a4
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 77e24e2e
  Patrick Dowler authored Sep 29, 2015
  
  77e24e2e
Sep 28, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · c2d12dcd
  Brian Major authored Sep 28, 2015
  
  c2d12dcd
Sep 25, 2015
- ac2 - Unit tests passing with connection pool · 412ff7a7
  Brian Major authored Sep 25, 2015
  
  412ff7a7
- ac2 - added LdapConfigTest, fixed test config · cc07c99f
  Brian Major authored Sep 25, 2015
  
  cc07c99f
Sep 24, 2015
- ac2 - LDAP Connection Pool · 20133e41
  Brian Major authored Sep 24, 2015
  
  20133e41
- Merge branch 'ac2' of mach277:/home/majorb/git/opencadc into ac2 · edf9d408
  Brian Major authored Sep 24, 2015
  
  edf9d408
Sep 18, 2015
- s1840: more int-test fixes · 96bbf0c1
  Jeff Burke authored Sep 18, 2015
  
  96bbf0c1
- Merge branch 'ac2' into s1840 · 5fac7b1e
  Jeff Burke authored Sep 18, 2015
```
Conflicts:
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
```
  5fac7b1e
- s1840: updated int-tests · 3a47a616
  Jeff Burke authored Sep 18, 2015
  
  3a47a616
- s1840: updated int-tests · a43e2478
  Jeff Burke authored Sep 18, 2015
  
  a43e2478
Sep 17, 2015
- ac2 - user log debugging info · f13b7606
  Brian Major authored Sep 17, 2015
  
  f13b7606
- ac2 - user log info for 'augment user' · 3da74b47
  Brian Major authored Sep 17, 2015
  
  3da74b47
- Story 1840. Minor formatting change when printing user details. · 7096ec20
  Alinga Yeung authored Sep 17, 2015
  
  7096ec20
Sep 16, 2015
- Story 1840. Since approvePendingUser() returns the approved user, added code... · d3a60287
  Alinga Yeung authored Sep 16, 2015
```
Story 1840. Since approvePendingUser() returns the approved user, added code to print details of the approved user.
```
  d3a60287
- added profiling to augment user path · 0837d469
  Brian Major authored Sep 16, 2015
  
  0837d469
- ac2 - added more profiling · 46207e97
  Brian Major authored Sep 16, 2015
  
  46207e97
- ac2 - added profiler start new request · 0a486bbe
  Brian Major authored Sep 16, 2015
  
  0a486bbe
- added profiling to augment user path · 61f5d800
  Brian Major authored Sep 16, 2015
  
  61f5d800
Sep 15, 2015
- fix conflicts in deleteUser · 9385e1e6
  Patrick Dowler authored Sep 15, 2015
  
  9385e1e6
- improve ldap query with minimal scope, remove redundant filters; fix... · 931f1c82
  Patrick Dowler authored Sep 15, 2015
```
improve ldap query with minimal scope, remove redundant filters; fix deleteUser to really delete pending users
```
  931f1c82
- ac2 - Added profiling to LDAPUserDAO.getAugmentedUser() · 6ce93e33
  Brian Major authored Sep 15, 2015
  
  6ce93e33