Commits · e0b7c5e34282b07d996aec00b959d66363169f8f · OATS-CADC / ac

Jul 31, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · e0b7c5e3
  Brian Major authored Jul 31, 2015
  
  e0b7c5e3
- s1729 - Initial version of cadc ldap authentication realm · bb1d0b33
  Brian Major authored Jul 31, 2015
  
  bb1d0b33
Jul 30, 2015
- Story 1731 ac2. Fixed merge conflicts. · da98ede5
  Alinga Yeung authored Jul 30, 2015
  
  da98ede5
Jul 28, 2015
- Merge branch 'ac2' of ssh://gimli2:/srv/cadc/git/wopencadc into ac2 · 9734fe19
  Brian Major authored Jul 28, 2015
  
  9734fe19
- ac - reinstated cadcTomcat for custom realm implementation · 614a2069
  Brian Major authored Jul 28, 2015
  
  614a2069
Jul 24, 2015

Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 53b8297f

Jeff Burke authored Jul 24, 2015

Conflicts:
	projects/cadcAccessControl-Server/test/LdapConfig.test.properties
	projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java

53b8297f

Jul 23, 2015
- ac2 removed deprecated project cadcTomcat · 132b99bd
  Brian Major authored Jul 23, 2015
  
  132b99bd
Aug 28, 2013
- Merging t35230 to installed for push to beta. · 3bb1201e
  CADC Software Admin--S.Gaudet authored Aug 28, 2013
  
  3bb1201e
Aug 27, 2013
- Merging s1367 to installed for push to beta. · 843b804d
  CADC Software Admin--S.Gaudet authored Aug 27, 2013
  
  843b804d
- Merging s1367 to installed for push to beta. · 04e6bbbb
  CADC Software Admin--S.Gaudet authored Aug 27, 2013
  
  04e6bbbb
- Merge branch 'master' of /srv/cadc/git/wopencadc into s1367 · 4bdd0345
  Dustin Jenkins authored Aug 27, 2013
  
  4bdd0345
Aug 21, 2013
- Merge branch 's1386' into installed · 56dc8efa
  CADC Software Admin--S.Gaudet authored Aug 21, 2013
  
  56dc8efa
- Merge branch 'master' into installed · 724312b3
  CADC Software Admin--S.Gaudet authored Aug 21, 2013
  
  724312b3
Aug 13, 2013
- Story 1367: Merge in installed branch. · 5aa3ee10
  Dustin Jenkins authored Aug 13, 2013
  
  5aa3ee10
- Merge branch 'master' into installed · 1001131d
  CADC Software Admin--S.Gaudet authored Aug 13, 2013
  
  1001131d
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into s1367 · 125b1fbf
  Dustin Jenkins authored Aug 13, 2013
  
  125b1fbf
Aug 09, 2013
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc · affef8d0
  Dustin Jenkins authored Aug 09, 2013
  
  affef8d0
Aug 01, 2013
- Merge branch 'CLF' into installed · 8f8dfd64
  CADC Software Admin--S.Gaudet authored Aug 01, 2013
  
  8f8dfd64
- Merge branch 'master' into installed · d0679bba
  CADC Software Admin--S.Gaudet authored Aug 01, 2013
  
  d0679bba
Jul 26, 2013
- Merge branch 'master' of /srv/cadc/git/wopencadc · ed0fccaf
  Jeff Burke authored Jul 26, 2013
  
  ed0fccaf
Jul 16, 2013

Fixed a merge conflict. · 07248fa1

CADC Software Admin--S.Gaudet authored Jul 16, 2013

Merge branch 'release_candidate' into installed

Conflicts:
	projects/cadcRegistry/src/resources/RegistryClient.properties

07248fa1

Jul 15, 2013
- Merge branch 'release_candidate' · ed4ccdcb
  Norman Hill authored Jul 15, 2013
  
  ed4ccdcb
- Merge branch 't32335' into release_candidate · 36bb8015
  Norman Hill authored Jul 15, 2013
  
  36bb8015
- Merge branch 't32335' into release_candidate · d7facb16
  Norman Hill authored Jul 15, 2013
  
  d7facb16
- Merge branch 't32335' · bf2c9585
  Norman Hill authored Jul 15, 2013
  
  bf2c9585
Jun 25, 2013
- Merge branch 't32335' of ssh://gimli2/srv/cadc/git/wopencadc into t32335 · a99407c1
  Patrick Dowler authored Jun 25, 2013
  
  a99407c1
- merged to github version · bcbe3217
  JJ Kavelaars authored Jun 24, 2013
  
  bcbe3217
Jun 24, 2013
- Merge branch 't32335' · 7b2bcde4
  JJ Kavelaars authored Jun 24, 2013
  
  7b2bcde4
Jun 19, 2013
- Merge branch 'subtree' into t32335 · ef9785a9
  JJ Kavelaars authored Jun 18, 2013
  
  ef9785a9
Jun 18, 2013
- Merge branch 'cadcVOFS_github_branch' into subtree · 2f7d7a77
  JJ Kavelaars authored Jun 18, 2013
```
Conflicts:
	projects/cadcVOFS/git_instructions.txt
```
  2f7d7a77
Jun 17, 2013
- merged with cutout · db03c8d4
  JJ Kavelaars authored Jun 17, 2013
  
  db03c8d4
- merged in D. Rusk's cutout functionality · e9f2c77a
  JJ Kavelaars authored Jun 17, 2013
  
  e9f2c77a
May 02, 2013
- Initial checkin to git from svn. · 2ff5a097
  drusk authored May 01, 2013
  
  2ff5a097
Apr 11, 2013

initial commit of cadcWCS module · 75df1e18

pdowler.cadc@gmail.com authored Apr 11, 2013


git-svn-id: https://opencadc.googlecode.com/svn/trunk@1969 728ff76a-78ac-11de-a72b-d90af8dea425

75df1e18

Mar 18, 2013
- Merge branch 'svn-merge' · 9570bff6
  JJ Kavelaars authored Mar 18, 2013
  
  9570bff6
- Merge remote-tracking branch 'trunk' into svn-merge · 5d76095c
  JJ Kavelaars authored Mar 18, 2013
  
  5d76095c
May 15, 2012

Addition of project cadcTomcat · 4bea09bc

majorb.cadc authored May 15, 2012

git-svn-id: https://opencadc.googlecode.com/svn/trunk@1545 728ff76a-78ac-11de-a72b-d90af8dea425

4bea09bc

Oct 17, 2011
- Intial project commit after export from googlecode · c8d8f46c
  JJ Kavelaars authored Oct 16, 2011
  
  c8d8f46c
Aug 08, 2011

Created 0.1 version of cadcVOFS Fuse project. · ed0579fd

djenkins.cadc authored Aug 08, 2011

git-svn-id: https://opencadc.googlecode.com/svn/trunk/cadcVOFS@1294 728ff76a-78ac-11de-a72b-d90af8dea425

ed0579fd

Jun 16, 2010
- refactor to move server-side code to server subpackage, add creation of client-only jar file · 2c8c2186
  pdowler.cadc authored Jun 16, 2010
```
git-svn-id: https://opencadc.googlecode.com/svn/trunk@643 728ff76a-78ac-11de-a72b-d90af8dea425
```
  2c8c2186