Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

No Format
git status ; git log --oneline master..integration/COMMON-2019FEB -- ACS
On branch integration/COMMON-2019FEB
Your branch is up to date with 'origin/integration/COMMON-2019FEB'.



nothing to commit, working tree clean
329772a9dd (HEAD -> integration/COMMON-2019FEB, origin/integration/COMMON-2019FEB) Merge remote-tracking branch 'origin/ICT-13859-provide-event-filtering-for-reliable' into integration/COMMON-2019FEB
8ca89c27eb (origin/ICT-13859-provide-event-filtering-for-reliable) ICT-13859: Implemented event filtering to reliable subscribers and list limit option for reliable subscribers
7626abf9f6 Merge remote-tracking branch 'origin/feature/ICT-13055' into integration/COMMON-2019FEB
93434962e2 Merge remote-tracking branch 'origin/ICT-13958' into integration/COMMON-2019FEB
1b294ce6da Merge remote-tracking branch 'origin/bugfix/ACACORR-ICT-11272-master' into integration/COMMON-2019FEB
2d45e303ea Merge remote-tracking branch 'origin/bugfix/ICT-13578' into integration/COMMON-2019FEB
ceebe56522 Merge remote-tracking branch 'origin/feature/ICT-13831' into integration/COMMON-2019FEB
8b8dc76f8a Merge remote-tracking branch 'origin/bugfix/ICT-13742-ONLINE-2019JAN-telcal-memory-corruption' into integration/COMMON-2019FEB
71b3acd910 Merge remote-tracking branch 'origin/ICT-13831-upgrade-3rd-party-archive' into integration/COMMON-2019FEB
bbb79ed3a7 Merge remote-tracking branch 'origin/bugfix/ICT-13963-tc_antpos-fails-with-all-asdms' into integration/COMMON-2019FEB
92ae1b4782 Merge remote-tracking branch 'origin/techncial/ICT-13973-mvn-poms' into integration/COMMON-2019FEB
d32c3a0634 fixed conflicts
a8d8ef585c Merge remote-tracking branch 'origin/feature/ICT-13964-ignore-binary-xml-flags-C7' into integration/COMMON-2019FEB
cf8958465b Merge remote-tracking branch 'origin/bugfix/ICT-13824-duplicated-SPWs-C7' into integration/COMMON-2019FEB
a03bd19d36 Merge remote-tracking branch 'origin/ICT-13586-tmcdb-explorer-keepalive' into integration/COMMON-2019FEB
d55f6699f3 (origin/ICT-13586-tmcdb-explorer-keepalive) changed default keepAlive time to 0
4475c966e5 Merge remote-tracking branch 'origin/bugfix/ICT-13589-tfint-xml-logs-are-not-being-stored' into integration/COMMON-2019FEB
79d9607062 Merge remote-tracking branch 'origin/bugfix/ICT-14100' into integration/COMMON-2019FEB
071b223190 Merge branch 'master' into integration/COMMON-2019FEB
7795326c55 (origin/bugfix/ICT-13589-tfint-xml-logs-are-not-being-stored) updated ACS version
eb4f023294 changing path for logs if required
6e71f72c9a ICT-7905 Add a method to retrieve matching receiver bands for name
db8fa080f2 ICT-7905 Add concept of Receiver band to sensitivity calculations in core
02cba3a248 (origin/bugfix/ICT-14100) ICT-14100 bugfix, adapting to the recent scheduling ICD changes.
c5d1288caf (origin/techncial/ICT-13973-mvn-poms) Merge branch 'master' into techncial/ICT-13973-mvn-poms
14d3430016 ICT-7905 Set correct receiver temperatures and overlap for Band 5
5d86cde003 Merge branch 'feature/ICT-14000-upgrade-icd-obops-spring-ver' into integration/COMMON-2019FEB
3f64c1420f (origin/feature/ICT-14000-upgrade-icd-obops-spring-ver) ICT-14000 & ICT-13972 updated ARCHIVE/ACS versions to 2019.02 in pom
910e148be0 (origin/feature/ICT-13831) Small improvement to the Makefile
177ee4ddcc Modifed jars to be included in some GUIs
6632acb72d Changed version of common-logging
dbbf6abe12 Removed conflicting jars after upgraded hibernate
076ed60547 Modified templates to fix code generation.
246be42720 Added changes to migrate to hibernate 5
109be050b1 Added changes to deal with problems in hibernate code generation
9e98be84b3 (origin/bugfix/ACACORR-ICT-11272-master) ICT-11272 bries of changes
4161034245 Added hibernate tools to the dependencies
8e3f114e4b Merge branch 'feature/ICT-13831' of https://bitbucket.sco.alma.cl/scm/alma/almasw into feature/ICT-13831
8ef4dba0d4 Replaced class by the one in obops
f5f872ba76 Merge branch 'feature/ICT-14000-upgrade-icd-obops-spring-ver' into integration/COMMON-2019FEB
4e6f66d090 ICT-14000 fixes to StateSystem for xtss with Hibernate 5.3
622c0ac1be (origin/ICT-13958) ICT-13958: ASDM improvements to version parsing, support CASA 6
002c30a07a Modified Makefile to make it work
47b8213eae Merge branch 'feature/ICT-14000-upgrade-icd-obops-spring-ver' into integration/COMMON-2019FEB
0ba14961a5 Merge branch 'master' into feature/ICT-14000-upgrade-icd-obops-spring-ver
0c61ae359c Updated hibernate to 5.3.7
f468dc4834 (origin/ICT-13831-upgrade-3rd-party-archive) ICT-13831 updated spring and spring security jars which are installed form Archive
12ad0e1ba5 Merge remote-tracking branch 'origin/feature/ICT-13587-log-keep-at-comp-startup' into integration/COMMON-2019FEB
d559a92b16 added keepalivetime to container log
aee34582d7 ICT-13839 TELCAL container crash on computeSourceDirection -> Handle gracefully error case when pointing data is not available
55b1797abd ICT-14000 changed Hibernate to 5.3.7 and Spring to 5.1.3
30ea2f0f89 Merged bugfix/ICT-13772-fix-statesystem-unit-tests into ICT-14000
5a61a7ed6d Merge branch 'feature/ICT-13972-icd-obops-poms-to-2019.02' into feature/ICT-14000-upgrade-icd-obops-spring-ver
c21e79362d ICT-13973 updated poms -> 2019.02-SNAPSHOT
483c21d22f (origin/feature/ICT-13813-integrate-in-telcal-latest-ATM) ICT-13813 Update unit tests
8df5c983b5 (origin/feature/ICT-13964-ignore-binary-xml-flags-C7) ICT-13964 Ignore binary/xml flags when obtaining antenna-based bandpass solutions
c0bbc5468c (origin/bugfix/ICT-13824-duplicated-SPWs-C7) ICT-13824 - Correct handling of duplicated SPWs in BBs - Improve reporting of BB Dc edge problems and negative Tsys
d5892a9d34 (origin/feature/ICT-13972-icd-obops-poms-to-2019.02) ICT-13972 updated ICD/OBOPS poms to COMMON-2019.02
5a5ab7cf6b ICT-13813 Merge changes from Juan Ramon into delivery branch for ONLINE-2019JAN
969c7a87f4 Merge remote-tracking branch 'origin/bugfix/ICT-13883-fix-telcal-sa-probelm-with-gsl' into feature/ICT-13813-integrate-in-telcal-latest-ATM
f31611e45c (origin/feature/ICT-13055, feature/ICT-13055) ICT-13055: Added resetReceiver boolean argument to startSend Default value is true. When true, it calls resetSend from startSend
f2a634308e (origin/bugfix/ICT-13742-ONLINE-2019JAN-telcal-memory-corruption) do not deref ptr to scan after removing it from the calib list, ICT-13742
3fb1958681 Merge remote-tracking branch 'origin/feature/ICT-12675-telcal-signal-path-calibration' into feature/ICT-13813-integrate-in-telcal-latest-ATM
bc0ad9b760 Merge remote-tracking branch 'origin/bugfix/ICT-13679-clic-fails-to-read-astro-holography' into feature/ICT-13813-integrate-in-telcal-latest-ATM
f5f83032d6 Merge remote-tracking branch 'origin/bugfix/ICT-13649-telcal-wrong-handling-of-binary-C7' into feature/ICT-13813-integrate-in-telcal-latest-ATM
74bf410cb4 Merge remote-tracking branch 'origin/feature/ICT-13683-adapt-telcal-for-new-created-array' into feature/ICT-13813-integrate-in-telcal-latest-ATM
4e225a9587 (origin/bugfix/ICT-13578, bugfix/ICT-13578) ICT-13578: Close the session factory at the end of the execution.

...