Merging STORAGE-dev to master
authorhristov <Peter.Hristov@cern.ch>
Tue, 12 Aug 2014 13:23:18 +0000 (15:23 +0200)
committerhristov <Peter.Hristov@cern.ch>
Tue, 12 Aug 2014 13:23:35 +0000 (15:23 +0200)
commit164d3d29c48a10906d3ea36ebfbafb0d873ae79e
treee8a96b3a5b482f79e562ac4c9bb3fee4c840e2a5
parentd53bf4ac7a9ad4b3997887255827300a8e4dd15e
Merging STORAGE-dev to master
95 files changed:
.gitignore
CMakeLists.txt
EVE/CMakebinalieve.pkg
EVE/CMakelibEveBase.pkg
EVE/EveBase/AliEveConfigManager.cxx
EVE/EveBase/AliEveConfigManager.h
EVE/EveBase/AliEveEventManager.cxx
EVE/EveBase/AliEveEventManager.h
EVE/EveBase/AliEveEventManagerEditor.cxx
EVE/EveBase/AliEveEventManagerEditor.h
EVE/EveBase/AliEveMainWindow.cxx
EVE/EveBase/AliEveTrackCounter.cxx
EVE/EveBase/EveBaseLinkDef.h
EVE/alieve_main/alieve_main.cxx
EVE/macros/alieve_online.C
EVE/macros/alieve_online_new.C
EVE/macros/online.C [new file with mode: 0644]
MONITOR/AliEventServerUtil.cxx [deleted file]
MONITOR/AliEventServerWindow.h [deleted file]
MONITOR/AliNetMessage.cxx [deleted file]
MONITOR/AliNetMessage.h [deleted file]
MONITOR/AliRecoServer.cxx [deleted file]
MONITOR/AliRecoServer.h [deleted file]
MONITOR/AliRecoServerThread.cxx [deleted file]
MONITOR/AliRecoServerThread.h [deleted file]
MONITOR/AliSocket.cxx [deleted file]
MONITOR/AliSocket.h [deleted file]
MONITOR/AliThreadedSocket.cxx [deleted file]
MONITOR/AliThreadedSocket.h [deleted file]
MONITOR/CMakeLists.txt
MONITOR/CMakelibMONITOR.pkg
MONITOR/CMakelibMONITORzmq.pkg
MONITOR/MONITORLinkDef.h
MONITOR/MONITORzmqLinkDef.h
MONITOR/alieventserver/AliEventServerPreferencesWindow.cxx [moved from MONITOR/AliEventServerPreferencesWindow.cxx with 100% similarity]
MONITOR/alieventserver/AliEventServerPreferencesWindow.h [moved from MONITOR/AliEventServerPreferencesWindow.h with 100% similarity]
MONITOR/alieventserver/AliEventServerReconstruction.cxx [new file with mode: 0644]
MONITOR/alieventserver/AliEventServerReconstruction.h [new file with mode: 0644]
MONITOR/alieventserver/AliEventServerUtil.h [moved from MONITOR/AliEventServerUtil.h with 81% similarity]
MONITOR/alieventserver/AliEventServerWindow.cxx [moved from MONITOR/AliEventServerWindow.cxx with 57% similarity]
MONITOR/alieventserver/AliEventServerWindow.h [new file with mode: 0644]
MONITOR/alieventserver/CMakebinalieventserver.pkg [moved from MONITOR/CMakebinalieventserver.pkg with 95% similarity]
MONITOR/alieventserver/alieventserver.cxx [moved from MONITOR/alieventserver.cxx with 95% similarity]
MONITOR/alieventserver/alieventserver.rootrc [moved from MONITOR/alieventserver.rootrc with 96% similarity]
MONITOR/alistoragemanager/AliStorageAdministratorPanel.cxx [moved from STORAGE/AliStorageAdministratorPanel.cxx with 82% similarity]
MONITOR/alistoragemanager/AliStorageAdministratorPanel.h [moved from STORAGE/AliStorageAdministratorPanel.h with 85% similarity]
MONITOR/alistoragemanager/AliStorageAdministratorPanelListEvents.cxx [moved from STORAGE/AliStorageAdministratorPanelListEvents.cxx with 86% similarity]
MONITOR/alistoragemanager/AliStorageAdministratorPanelListEvents.h [moved from STORAGE/AliStorageAdministratorPanelListEvents.h with 87% similarity]
MONITOR/alistoragemanager/AliStorageAdministratorPanelMarkEvent.cxx [moved from STORAGE/AliStorageAdministratorPanelMarkEvent.cxx with 87% similarity]
MONITOR/alistoragemanager/AliStorageAdministratorPanelMarkEvent.h [moved from STORAGE/AliStorageAdministratorPanelMarkEvent.h with 91% similarity]
MONITOR/alistoragemanager/AliStorageAdministratorPanelSetStorageParams.cxx [moved from STORAGE/AliStorageAdministratorPanelSetStorageParams.cxx with 92% similarity]
MONITOR/alistoragemanager/AliStorageAdministratorPanelSetStorageParams.h [moved from STORAGE/AliStorageAdministratorPanelSetStorageParams.h with 92% similarity]
MONITOR/alistoragemanager/AliStorageClientThread.cxx [moved from STORAGE/AliStorageClientThread.cxx with 75% similarity]
MONITOR/alistoragemanager/AliStorageClientThread.h [moved from STORAGE/AliStorageClientThread.h with 85% similarity]
MONITOR/alistoragemanager/AliStorageDatabase.cxx [moved from STORAGE/AliStorageDatabase.cxx with 76% similarity]
MONITOR/alistoragemanager/AliStorageDatabase.h [moved from STORAGE/AliStorageDatabase.h with 98% similarity]
MONITOR/alistoragemanager/AliStorageEventManager.cxx [new file with mode: 0644]
MONITOR/alistoragemanager/AliStorageEventManager.h [new file with mode: 0644]
MONITOR/alistoragemanager/AliStorageServerThread.cxx [moved from STORAGE/AliStorageServerThread.cxx with 70% similarity]
MONITOR/alistoragemanager/AliStorageServerThread.h [moved from STORAGE/AliStorageServerThread.h with 68% similarity]
MONITOR/alistoragemanager/AliStorageTypes.h [moved from STORAGE/AliStorageTypes.h with 71% similarity]
MONITOR/alistoragemanager/CMakebinalifakedisplay.pkg [new file with mode: 0644]
MONITOR/alistoragemanager/CMakebinalistorage.pkg [new file with mode: 0644]
MONITOR/alistoragemanager/CMakebinalistorageadmin.pkg [new file with mode: 0644]
MONITOR/alistoragemanager/CMakebinalistoragegetpoints.pkg [new file with mode: 0644]
MONITOR/alistoragemanager/CMakebinalistorageminimalexample.pkg [new file with mode: 0644]
MONITOR/alistoragemanager/StorageLinkDef.h [moved from STORAGE/StorageLinkDef.h with 100% similarity, mode: 0644]
MONITOR/alistoragemanager/alifakedisplay.cxx [new file with mode: 0644]
MONITOR/alistoragemanager/alistorage.cxx [moved from STORAGE/alistorage_main/alistorage_main.cxx with 93% similarity]
MONITOR/alistoragemanager/alistorageadmin.cxx [moved from STORAGE/alistorageadmin_main/alistorageadmin_main.cxx with 100% similarity]
MONITOR/alistoragemanager/alistoragegetpoints.cxx [new file with mode: 0644]
MONITOR/alistoragemanager/alistorageminimalexample.cxx [new file with mode: 0644]
MONITOR/alistoragemanager/clearAll.sh [moved from STORAGE/clearAll.sh with 77% similarity, mode: 0644]
MONITOR/alistoragemanager/setupStorageDatabase.sh [moved from STORAGE/setupStorageDatabase.sh with 71% similarity, mode: 0644]
MONITOR/alitestproc/AliTestChildProc.cxx [moved from MONITOR/AliTestChildProc.cxx with 100% similarity]
MONITOR/alitestproc/AliTestChildProc.h [moved from MONITOR/AliTestChildProc.h with 100% similarity]
MONITOR/alitestproc/CMakebinalitestproc.pkg [moved from MONITOR/CMakebinalitestproc.pkg with 97% similarity]
MONITOR/alitestproc/alitestproc.cxx [moved from MONITOR/alitestproc.cxx with 100% similarity]
MONITOR/deroot/CMakebinderoot.pkg [moved from MONITOR/CMakebinderoot.pkg with 95% similarity]
MONITOR/deroot/deroot.cxx [moved from MONITOR/deroot.cxx with 100% similarity]
MONITOR/deroot/deroot.h [moved from MONITOR/deroot.h with 100% similarity]
MONITOR/deroot/root2date.cxx [moved from MONITOR/root2date.cxx with 100% similarity]
MONITOR/deroot/root2date.h [moved from MONITOR/root2date.h with 100% similarity]
MONITOR/monitorCheck/CMakebinmonitorCheck.pkg [moved from MONITOR/CMakebinmonitorCheck.pkg with 89% similarity]
MONITOR/monitorCheck/monitorCheck.cxx [moved from MONITOR/monitorCheck.cxx with 100% similarity]
MONITOR/monitorGDC/CMakebinmonitorGDC.pkg [moved from MONITOR/CMakebinmonitorGDC.pkg with 88% similarity]
MONITOR/monitorGDC/monitorGDC.cxx [moved from MONITOR/monitorGDC.cxx with 100% similarity]
STORAGE/AliStorageEventManager.cxx [deleted file]
STORAGE/AliStorageEventManager.h [deleted file]
STORAGE/CMakeLists.txt [deleted file]
STORAGE/CMakebinalifakedisplay.pkg [deleted file]
STORAGE/CMakebinalistorage.pkg [deleted file]
STORAGE/CMakebinalistorageadmin.pkg [deleted file]
STORAGE/CMakelibStorage.pkg [deleted file]
STORAGE/alifakedisplay.cxx [deleted file]