git status
On branch integration/COMMON-2020APR
Your branch is up to date with 'origin/integration/COMMON-2020APR'.

git log --no-merges --oneline origin/master..origin/integration/COMMON-2020APR -- ACS
2a9eb84f81 (origin/bugfix/ICT-16202, bugfix/ICT-16202) ICT-16202: Check if the IDL dependency in ../idl is part of IDL_FILES, else assume it is in the other path (src, test)
385eff860f (origin/ICT-16497-bulkreceiverflow-should-expose-the-notification-channel-publisher) Exposing status through  errorStatusSupplier_p
0d91a1be3a (origin/bugfix/ICT-16594, bugfix/ICT-16594) ICT-16594: Python BACI implementation returns default values on CDB problems
be401c0eb3 (HEAD -> task/ICT-16002-2020APR, origin/task/ICT-16002-2020APR) ICT-16109: Several changes for fixing acspy tests and making them Python 3 compatible
3c5906565c ICT-16588: Updated containerTests/corbaRefPersistenceTest to be Python 2 and 3 compatible and to change jacorb.connection.server.timeout in maciManagerJ to be useful for the test
c6fe9d72ea (origin/task/ICT-16323, task/ICT-16323) ICT-16323: Adding correct reference files for the Java BDNT tests
f25cf45dc2 ICT-16152: bulkDataNT tests were fixed to current ACS behavior
e8c17e5624 (origin/bugfix/ICT-16577, bugfix/ICT-16577) ICT-16577: Updated the bulkDataNTGenSender and bulkDataNTGenReceiver to consider the changes for ICT-16577 (Now it is possible to delete the SimpleClient in the receiver)
b51c7fb5c9 ICT-16577: Added a variable to check if the logger is local or not in order to decide its deletion on library exit
a80a999313 ICT-16574: Updated acsnc tests to be compatible with current ACS behavior
12a68a66f7 (origin/feature/ICT-16565, feature/ICT-16565) ICT-16565: Added thread safe protection for makeDirectory method
ad2e39ec25 ICT-16563: Updated nsStatisticsService tests to use print function in Python 2 and 3
6ba489545e ICT-16563: Updated nsStatisticsService tests to be Python 2 and 3 compatible
e01cfd46ce ICT-16155: Updated tests to latest changes (fast NC disconnection Java and cached CDB C++)
33826a74d0 ICT-16172: Updated jcontnc tests to current ACS version behavior
9e93c4a599 ICT-16477: Fixed reference files and sed to be compatible with Python 2 and 3 output
5c1d0013ca ICT-16153: bulkData tests now filters the cached CDB log in the container
c3a9afe5fc ICT-16119: nctest module's tests were checked and updated to pass with the current ACS version
baf371a39f ICT-16561: Updated nctest module's tests Python 2 script to be compatible with Python 2 and 3
fb3b6bbcb3 (origin/bugfix/ICT-16560, bugfix/ICT-16560) ICT-16560: Fixed the forceful stop of the thread checking NC state in Java
d9b1d96d37 (origin/bugfix/ICT-16559, bugfix/ICT-16559) ICT-16559: Improved the handling of getContainerCDB method in maciContainerImpl and maciContainerServices
bf8a7356c5 ICT-16473: Fixed maci module's tests
e2e7b7d804 ICT-16151: Improved the test results of jbaci for Python 2 and 3
4d2c885f79 ICT-16198: A missing fix for monitoring/moncollect tests
9220bfa690 ICT-16198: Fixed monitoring/moncollect tests for Python 2 and 3 compatibility
c990ff10af (origin/bugfix/ICT-16506, bugfix/ICT-16506) ICT-16506: Corrected small typos
c8abbc7885 ICT-16506: onValueChange when pollInterval is zero
407c5978b1 (origin/feature/ICT-16500, feature/ICT-16500) ICT-16500: Fixed indentation and removed fpformat on Subsytem.py file
5740b77c17 (origin/feature/ICT-16413, feature/ICT-16413) ICT-16413: Piggyback fix for 'import new' to 'import types'
d5de41ad45 ICT-16201: Lots of changes to acssim module's tests to make it Python 2 and 3 compatible
24bd56da01 (origin/feature/ICT-16479, feature/ICT-16479) ICT-16479: Consistent check of "not isinstance" instead of "isinstance == 0"
6a39a3e92e ICT-16479: acssim improved handling of tk_alias and tk_sequence in Generator.py
95a4870358 ICT-16478: Updated sed file in acssim module's tests
29fc7d12b9 ICT-16478: acssim: Updated tests a bit more for Python 2 and 3 compatibility
0efafba5cc ICT-16479: acssim now compiles code compatible with __future__ module
787b6d1b11 (origin/bugfix/ICT-16491, bugfix/ICT-16491) ICT-16491: Force to reinstall pip packages to have a clean installation after buildPyModules
c3249e934f ICT-16490: Moved testDBM to testDBM.db in Benchmark/analyzer module
df38d1f74d (origin/feature/ICT-16489, feature/ICT-16489) ICT-16489: Modified Benchmark/analyser to be Python 2 and 3 compatible
97cee3bcfd ICT-16033: Added grep line to acsstartup for acsConfigureNotificationChannels output
699a422ae9 ICT-16487: laser-soure-python compatibility with Python 2 and 3
613864ff83 ICT-16045: acsjlog module tests grepping openjdk logs
c0d1ff40d4 ICT-16478: Updated reference file and TestList.sed files in acssim module's tests
ee37dd6950 ICT-16478: acssim Simulated code made Python2 and 3 compatible along other test compatibility fixes
70c1a440b1 (origin/bugfix/ICT-16467, bugfix/ICT-16467) ICT-16467: Added __class__, __dir__ and __dict__ to elements to be skipped in XmlObjectifier
5018392ed9 (origin/feature/ICT-16479, feature/ICT-16479) ICT-16479: Stringify binary data loaded before parsing and editing it
d1143f6801 ICT-16479: Metaclass compatibility between Python 2 and 3
e3ab62f9ab ICT-16479: ICT-16479: Replaced new import by types in BACIHelper.py
f34d20f577 ICT-16479: Replaced new and operator imports for types and collections
a067d1128b ICT-16478: Making acssim tests Python 2 and 3 compatible
cdff0a1f85 ICT-16477: Updated acspyexmpl tests to be Python 2 and 3 compatible
afd4cf87dc ICT-16476: monitoring/moncollect tests are now Python 2 and 3 compatible
7e9cee14ab ICT-16474: Made jbaci module's tests Python 2 and 3 compatible
96dcb05380 ICT-16151: Disabled 2 tests because their scripts don't exist
a2a3a7e0c6 ICT-16151: Added missing reference files
2675d6e7ec (origin/bugfix/ICT-16469, bugfix/ICT-16469) ICT-16469: Replaced '_' by 'e' as anonymous element in CDBProperties module
0cf09b4b0c ICT-16467: Ignore read-only attributes when copying attributes from minidom.Document and minidom.Element
7fa50f18b2 ICT-16457: Further fixes of acspy tests now with mock version 3.0.5
1611dd4e00 ICT-16464: Updated acsalarmpy module's tests to be Python 2 and 3 compatible
a8ec341a3c (origin/bugfix/ICT-16465, bugfix/ICT-16465) ICT-16465: Update mock version to 3.0.5 due to __doc__ bug
bca7298e52 (origin/feature/ICT-16462, feature/ICT-16462) ICT-16462: Removing automatic setting of Python version in .bash_profile.acs
3a85fae3d7 ICT-16457: Making the print of keepAlive string compatible with mocking in test modules
bdeb2e97eb ICT-16457: Making acspy module's tests compatible with Python 2 and 3
ddd96852b0 ICT-16183: Updated reference file for AutoReconnect test cases and increased time for loggingService to start
d94b2a33ec (origin/bugfix/ICT-16406, bugfix/ICT-16406) ICT-16406: Updated six version to support ensure_text and ensure_str functions
9ff7b39150 ICT-16406: Changed ensure_text to ensure_str to convert to str in Python 2 and 3 (Other wise it was unicode in Python 2)
d465fe9585 (origin/feature/ICT-16417, feature/ICT-16417) ICT-16417: Send an error if the Manager is not available when executing acsConfigureNotificationChannels script
2c42068e23 (origin/feature/ICT-16413, feature/ICT-16413) ICT-161413: Changed to ErrorTrace and LoggingStatistics integer division for Python 2 and 3 compatibility
6a2963c6b7 ICT-16412: Making acspycommon module's tests Python 2 and 3 compatible
5ff05440ea (origin/feature/ICT-16409, feature/ICT-16409) ICT-16409: Removed PYTHONINC definition from .bash_profile.acs to allow dynamic change for compilation
acdd50ea7a ICT-16409: Added PYTHONABI to PYTHONLIB name
f20fcc9673 ICT-16409: Added several variables for helping with Python version dynamically in Makefile PYTHON_ROOT, PYTHONINC, PYTHONVER, PYTHONLIB, PYTHONINS
1516f406bc (origin/feature/ICT-16407, feature/ICT-16407) ICT-16407: Changed the use of content by orderedContent in PyXB API due to deprecation of the former method
7113321d45 ICT-16406: Changed str.encode for six.ensure_text(encoding=...) in CDBAccess.py file
e1ad009147 (origin/bugfix/ICT-16402, bugfix/ICT-16402) ICT-16402: Make the Python ACS Logger compatible with Python 3 while maintaining backwards compatibility with Python 2
e3cd0209c0 (origin/bugfix/ICT-16342) Removed some python 2 incompatible code
4d4f7556ac removed new from imports
9d46d36e18 (origin/feature/ICT-16378, feature/ICT-16378) ICT-16378: Removed PyXML from the ACS/LGPL/Tools/extpy installation
1a9e88cb72 (origin/bugfix/ICT-16291, bugfix/ICT-16291) ICT-16291: Adding missing semicolon typo
f8aff4f890 ICT-16291: Adding include file, namespace and fixed small typo for error handling
8a59debafd (origin/feture/ICT-16352, feture/ICT-16352) ICT-16352: Fixing small detail with Makefile function
6e9fcc8542 ICT-16352: Updated Makefile to support both Python 2 and 3 cache files
1b21be9b52 ICT-16291: Added more protection regarding the ncChecker thread creation
dfd8acea8d ICT-16291: Added protection to the call that generated the container crash
3131be5727 (origin/task/ICT-16323, task/ICT-16323) ICT-16323: Added Java BDNT tests to bulkDataNT module's tests
38952b477c (origin/bugfix/ICT-16321, bugfix/ICT-16321) ICT-16321: Fixed tests exceptions being throwed to be consistent with changes in interfaces and implementation
e93d7b51f3 (origin/bugfix/ICT-16320, bugfix/ICT-16320) ICT-16320: Fixed bug destroying list of streams
1e1c571a07 (origin/bugfix/ICT-16322, bugfix/ICT-16322) ICT-16322: Fixed the test scripts and loading of QoS XML file in performance test
5b2a7f2626 (origin/bugfix/ICT-16349, bugfix/ICT-16349) ICT-16349: Removing gnuplot, numarray and pychecker from buildPyModules as they're provided elsewhere
1d91c93ac1 ICT-16348: Change ACS version to 2020APR
5f8da67fe3 (origin/bugfix/ICT-16029, bugfix/ICT-16029) ICT-16029: Added patch to retrieve all child elements to maven version of xercesj

git log --no-merges --oneline origin/master..origin/integration/COMMON-2020APR -- ARCHIVE
8af740243f (origin/bugfix/ICT-15771-datapacker-is-translating-some-symbols-that-produce-problems-in-casa) ICT-15771 further changes required after testing
ea51bb7fcc ICT-15771 stop transforming the XML data when exporting to directory
a96a1745c4 ICT-15771 stop transforming the XML data when exporting to directory now that CASA can handle proper XML
cd74ed17af (origin/ICT-16265-mvn-archive-icd-2020apr) ICT-11388: updated poms ->

git log --no-merges --oneline origin/master..origin/integration/COMMON-2020APR -- ICD
b2546f6abb (origin/ICT-12131-move-LOSolutions) Move LOSolutions from CONTROL/Common to ICD/Implementation so that the OT does not have a dependency on CONTROL.
39a379b2e2 ICT-12139: Deleted cpp modules under Implementation directory.  Updated CORR to build TmcdbAccess
737387f261 Remove executable permission for these files
c3103d32b3 Move eclipse configuration files to the same module as the implementation
dd25677cba Whitespace only change
7891204d31 Delete a file that is no longer needed. I do not understand why this was not deleted earlier.
a790266635 Do not build some classes that will soon be moved to another place
f30da29640 Update a dependency as the relevant library is now in a different module
cd74ed17af (origin/ICT-16265-mvn-archive-icd-2020apr) ICT-11388: updated poms ->
97a98e1b32 Replace the classes from a deleted module with identical ones from the replacement module
60e1830326 Move the ICD/CONTROL/TMCDBComponent module to ICD/SharedCode/TMCDBInterface
81ed698abf Remove some unnecessary TMCDB dependencies replacing the with the correct dependency
c0b5a01973 Move the TMCDB implementation from ICD/SharedCode to ICD/Implementation so that changes with no side-effects do not require a change request.
75358befb2 Move the TMCDB::Access interface (IDL file) to the ICD/CONTROL/TMCDBComponent module. The implementation has not moved.
aa8d8cc2dd Remove the source of the TMCDBComponent. It has been superceeded by the Access component
ea5543bb61 Whitespace only changes like replacing tabs with spaces
8d40d5d530 Move all the type definitions in TMCDBAccessIF.idl into TMCDBDataStructures.idl
49a5086fd4 1. Moved all the type definitions from TMCDBComponent.idl to TMCDBDataStructures.idl. 2. Disabled the compilation of TMCDBComponent.idl.
308cc9810e Update copywrite only
4c7bcfd4a9 Remove a module that is no longer used and out-of-date.