Commits · 30f6226e2304aa99ea56ee14eb9ca1ac63d3dc07 · OATS-CADC / ac

Jul 10, 2014
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc · 30f6226e
  Dustin Jenkins authored 10 years ago
  
  30f6226e
Jul 09, 2014
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc · 96dd8740
  Dustin Jenkins authored 10 years ago
  
  96dd8740
Jul 08, 2014
- Merge branch 's1564' into release_candidate · 82b2df60
  CADC Software Admin--S.Gaudet authored 10 years ago
  
  82b2df60
Jul 02, 2014
- Moved AC core classes from cadcUtil · 190f49fe
  Adrian Damian authored 10 years ago
  
  190f49fe
- Merge branch 'master' into s1638 · 23e10411
  Adrian Damian authored 10 years ago
  
  23e10411
- Moved AC core classes from cadcUtil · 4b1757fb
  Adrian Damian authored 10 years ago
  
  4b1757fb
Jun 27, 2014
- Added the core authorization classes - code review changes · 06d67ed4
  Adrian Damian authored 10 years ago
  
  06d67ed4
Jun 26, 2014
- Added the core authorization classes - code review changes · d6c8a952
  Adrian Damian authored 10 years ago
  
  d6c8a952
Jun 25, 2014
- Added the core authorization classes - code review changes · 7e1babdb
  Adrian Damian authored 10 years ago
  
  7e1babdb
- Added the core authorization classes · 48adcd6d
  Adrian Damian authored 10 years ago
  
  48adcd6d
- Added the core authorization classes · c073c917
  Adrian Damian authored 10 years ago
  
  c073c917
May 26, 2014
- Story 1607: Merge conflict with master. · f94789a2
  Dustin Jenkins authored 10 years ago
  
  f94789a2
May 21, 2014
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into s1578 · fb40eb8f
  Dustin Jenkins authored 10 years ago
  
  fb40eb8f
May 14, 2014
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into s1554 · c768d2ed
  Dustin Jenkins authored 10 years ago
  
  c768d2ed
May 13, 2014
- Merge branch 's1554' of ssh://gimli2/srv/cadc/git/wopencadc into s1554 · 2ed1fa50
  Dustin Jenkins authored 10 years ago
  
  2ed1fa50
- Merge branch 's1554' of /srv/cadc/git/wopencadc into s1554 · 3c024feb
  Jeff Burke authored 10 years ago
  
  3c024feb
- Merge branch 'master' into s1554 · 82d58313
  Jeff Burke authored 10 years ago
  
  82d58313
May 12, 2014
- Merge branch 's1567' into s1471 · 69118e40
  Patrick Dowler authored 10 years ago
  
  69118e40
May 09, 2014
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into s1567 · 290df8a9
  Patrick Dowler authored 10 years ago
  
  290df8a9
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into s1554 · a22aeab4
  Dustin Jenkins authored 10 years ago
  
  a22aeab4
May 05, 2014
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into s1565 · a82b5e7c
  Dustin Jenkins authored 10 years ago
  
  a82b5e7c
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into s1565 · 694ec159
  Dustin Jenkins authored 10 years ago
  
  694ec159
May 02, 2014
- Merge branch 'master' into s1565 · d519d6c3
  Jeff Burke authored 10 years ago
  
  d519d6c3
May 01, 2014
- Merge branch 'master' of /srv/cadc/git/wopencadc into s1567 · bae0e3c1
  Brian Major authored 10 years ago
  
  bae0e3c1
Apr 30, 2014
- Merge branch 's1567' of ssh://gimli2/srv/cadc/git/wopencadc into s1567 · afa98cae
  Patrick Dowler authored 10 years ago
  
  afa98cae
Apr 29, 2014
- s1567 - Migration of cadcTAP table writing to use cadcDALI library · 9a413545
  Brian Major authored 10 years ago
  
  9a413545
Aug 28, 2013
- Merging t35230 to installed for push to beta. · 02fcfc7f
  CADC Software Admin--S.Gaudet authored 11 years ago
  
  02fcfc7f
Aug 27, 2013
- Merging s1367 to installed for push to beta. · 9364b3b3
  CADC Software Admin--S.Gaudet authored 11 years ago
  
  9364b3b3
- Merging s1367 to installed for push to beta. · f665fa72
  CADC Software Admin--S.Gaudet authored 11 years ago
  
  f665fa72
- Merge branch 'master' of /srv/cadc/git/wopencadc into s1367 · d687870c
  Dustin Jenkins authored 11 years ago
  
  d687870c
Aug 21, 2013
- Merge branch 's1386' into installed · cdd72731
  CADC Software Admin--S.Gaudet authored 11 years ago
  
  cdd72731
- Merge branch 'master' into installed · be446001
  CADC Software Admin--S.Gaudet authored 11 years ago
  
  be446001
Aug 13, 2013
- Story 1367: Merge in installed branch. · 42764e45
  Dustin Jenkins authored 11 years ago
  
  42764e45
- Merge branch 'master' into installed · 273bd966
  CADC Software Admin--S.Gaudet authored 11 years ago
  
  273bd966
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into s1367 · 2af38fb2
  Dustin Jenkins authored 11 years ago
  
  2af38fb2
Aug 09, 2013
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc · 18a1f87d
  Dustin Jenkins authored 11 years ago
  
  18a1f87d
Aug 01, 2013
- Merge branch 'CLF' into installed · 6dc98efb
  CADC Software Admin--S.Gaudet authored 11 years ago
  
  6dc98efb
- Merge branch 'master' into installed · 779860c6
  CADC Software Admin--S.Gaudet authored 11 years ago
  
  779860c6
Jul 26, 2013
- Merge branch 'master' of /srv/cadc/git/wopencadc · 5cfca187
  Jeff Burke authored 11 years ago
  
  5cfca187
Jul 16, 2013

CADC Software Admin--S.Gaudet authored 11 years ago

Merge branch 'release_candidate' into installed

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

24d551ff