summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Niry Rakotosalama [Wed, 3 Sep 2014 13:20:44 +0000 (15:20 +0200)] 
Merge remote-tracking branch 'origin/dev_tr65_aca_913_correctif_evf_vau' into int_tr65_nra_2.3.3
Alexandre Cazalis (Alten) [Wed, 3 Sep 2014 12:22:03 +0000 (14:22 +0200)] 
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.3' into dev_tr65_aca_913_correctif_evf_vau
Conflicts:
dev/common/libhrtrk/CHANGELOG.txt
dev/common/libhrtrk/src/version.c
Niry Rakotosalama [Wed, 3 Sep 2014 09:11:24 +0000 (11:11 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_sto_ft880_tests_auto' into int_tr65_nra_2.3.3
Niry Rakotosalama [Tue, 2 Sep 2014 10:08:10 +0000 (12:08 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_aca_908_visu_az_freq' into int_tr65_nra_2.3.3
Niry Rakotosalama [Tue, 2 Sep 2014 10:03:52 +0000 (12:03 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_aca_877_resolution_dsp' into int_tr65_nra_2.3.3
Niry Rakotosalama [Tue, 2 Sep 2014 10:00:38 +0000 (12:00 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_aca_907_az_sigma_az_evf' into int_tr65_nra_2.3.3
Alexandre Cazalis (Alten) [Tue, 2 Sep 2014 09:56:42 +0000 (11:56 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.3' into dev_tr65_aca_908_visu_az_freq
Alexandre Cazalis (Alten) [Tue, 2 Sep 2014 09:53:26 +0000 (11:53 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.3' into dev_tr65_aca_877_resolution_dsp
Niry Rakotosalama [Tue, 2 Sep 2014 09:52:41 +0000 (11:52 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_aca_548_respect_spec_evf' into int_tr65_nra_2.3.3
Alexandre Cazalis (Alten) [Tue, 2 Sep 2014 09:47:02 +0000 (11:47 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.3' into dev_tr65_aca_907_az_sigma_az_evf
Conflicts:
dev/common/libhrtrk/CHANGELOG.txt
dev/common/libhrtrk/src/version.c
Alexandre Cazalis (Alten) [Tue, 2 Sep 2014 09:37:23 +0000 (11:37 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.3' into dev_tr65_aca_548_respect_spec_evf
Niry Rakotosalama [Tue, 2 Sep 2014 09:35:16 +0000 (11:35 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_tpe_906_wait_for_first_iq' into int_tr65_nra_2.3.3
Merge remote-tracking branch 'origin/dev_tr65_tpe_788_mutex_unlock_and_signal' into int_tr65_nra_2.3.3
Niry Rakotosalama [Mon, 1 Sep 2014 15:24:22 +0000 (17:24 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_tpe_911_tools_wrapper_invalid_path' into int_tr65_nra_2.3.3
Niry Rakotosalama [Mon, 1 Sep 2014 15:21:20 +0000 (17:21 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_tpe_910_start_active_state_param' into int_tr65_nra_2.3.3 (adds --no-full-bite option)
Niry Rakotosalama [Mon, 1 Sep 2014 15:17:07 +0000 (17:17 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_tpe_909_log4cxx_empty_line' into int_tr65_nra_2.3.3
Niry Rakotosalama [Thu, 7 Aug 2014 13:43:02 +0000 (15:43 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_sto_ft880_tests_auto' into int_tr65_nra_2.3.3
Niry Rakotosalama [Thu, 24 Jul 2014 09:04:31 +0000 (11:04 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_aca_882_pb_evf_terrain' into int_tr65_nra_2.3.2
FT882 : Adds histogram frequency resolution parameter (libhrtrk interface evolution)
Niry Rakotosalama [Thu, 24 Jul 2014 08:41:45 +0000 (10:41 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_nra_ft881_spu_node_exit' into int_tr65_nra_2.3.2
FT894 : sois_nmgr interface offset between 32 and 64 bits. Replaces existing reserved fields to store autosoi parameters instead of new struct StAutoSoiParam.
Alexandre Cazalis (Alten) [Thu, 24 Jul 2014 08:37:32 +0000 (10:37 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.2' into dev_tr65_aca_882_pb_evf_terrain
Niry Rakotosalama [Wed, 23 Jul 2014 14:58:05 +0000 (16:58 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_aca_882_pb_evf_terrain' into int_tr65_nra_2.3.2
Alexandre Cazalis (Alten) [Wed, 23 Jul 2014 14:42:20 +0000 (16:42 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.2' into dev_tr65_aca_882_pb_evf_terrain
Alexandre Cazalis (Alten) [Wed, 23 Jul 2014 14:01:51 +0000 (16:01 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.2' into dev_tr65_aca_882_pb_evf_terrain
Niry Rakotosalama [Tue, 22 Jul 2014 13:10:46 +0000 (15:10 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_aca_873_algo_denombrement_vp' into int_tr65_nra_2.3.2
FT873
Niry Rakotosalama [Tue, 22 Jul 2014 12:56:23 +0000 (14:56 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_nra_ft891_auto_soi_bw_margin' into int_tr65_nra_2.3.2
FT891 : adds logs to display auto soi internal status
updates soi bw with track one only if it is not defined into cmd (i.e. 100Hz)
Niry Rakotosalama [Tue, 22 Jul 2014 12:49:18 +0000 (14:49 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_aca_882_pb_evf_terrain' into int_tr65_nra_2.3.2
(avoid evf on fnl_vol2 reco test)
Alexandre Cazalis (Alten) [Tue, 22 Jul 2014 12:45:03 +0000 (14:45 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.2' into dev_tr65_aca_873_algo_denombrement_vp
Alexandre Cazalis (Alten) [Tue, 22 Jul 2014 12:29:50 +0000 (14:29 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.2' into dev_tr65_aca_882_pb_evf_terrain
Niry Rakotosalama [Tue, 22 Jul 2014 08:06:52 +0000 (10:06 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_ACA_871_chemin_parsing_fichier_conf' into int_tr65_nra_2.3.2
Alexandre Cazalis (Alten) [Tue, 22 Jul 2014 06:49:59 +0000 (08:49 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.2' into dev_tr65_ACA_871_chemin_parsing_fichier_conf
Alexandre Cazalis (Alten) [Mon, 21 Jul 2014 12:47:04 +0000 (14:47 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.2' into dev_tr65_ACA_871_chemin_parsing_fichier_conf
Conflicts:
dev/code_metier/libPist/src/libpist.c
Alexandre Cazalis (Alten) [Mon, 21 Jul 2014 12:05:14 +0000 (14:05 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.2' into dev_tr65_aca_873_algo_denombrement_vp
Alexandre Cazalis (Alten) [Mon, 21 Jul 2014 12:02:33 +0000 (14:02 +0200)]
Merge tag 'LIV_TRC6500_2.3.1' into dev_tr65_aca_873_algo_denombrement_vp
Niry Rakotosalama [Fri, 18 Jul 2014 09:54:18 +0000 (11:54 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_nra_ft891_auto_soi_bw_margin' into int_tr65_nra_2.3.2
Conflicts:
dev/code_metier/libSOISeq/src/tab_job.c
Niry Rakotosalama [Fri, 18 Jul 2014 09:43:14 +0000 (11:43 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_aca_882_pb_evf_terrain' into int_tr65_nra_2.3.2
Alexandre Cazalis (Alten) [Fri, 18 Jul 2014 09:23:21 +0000 (11:23 +0200)]
Merge remote-tracking branch 'origin/int_tr64_nra_2.3.2' into dev_tr65_aca_882_pb_evf_terrain
Niry Rakotosalama [Thu, 17 Jul 2014 17:32:59 +0000 (19:32 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_nra_ft881_spu_node_exit' into int_tr65_nra_2.3.2
Niry Rakotosalama [Wed, 9 Jul 2014 08:23:38 +0000 (10:23 +0200)]
Merge tag 'LIV_TRC6500_2.3.1' into dev_tr65_nra_ft881_spu_node_exit
Niry Rakotosalama [Tue, 8 Jul 2014 17:50:16 +0000 (19:50 +0200)]
Merge remote-tracking branch 'origin/master'
Niry Rakotosalama [Fri, 4 Jul 2014 12:17:33 +0000 (14:17 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into dev_tr65_nra_ft872_invalid_track_monres with PLOT_T messages size increasing
impacts dependances on libmiso/libgonext/Xgon/Gonext/Monitoring
Conflicts:
dev/common/libhrgonio/CHANGELOG.txt
dev/modele/implementation/trc6500_chaine_gon/XGon/CHANGELOG.txt
dev/modele/implementation/trc6500_chaine_gon/XGon/src/Version.cpp
dev/modele/implementation/trc6500_chaine_sup/SupCapteur/CHANGELOG.txt
Correcs ITRSOI dependances
Niry Rakotosalama [Fri, 4 Jul 2014 12:17:33 +0000 (14:17 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into dev_tr65_nra_ft872_invalid_track_monres with PLOT_T messages size increasing
impacts dependances on libmiso/libgonext/Xgon/Gonext/Monitoring
Conflicts:
dev/common/libhrgonio/CHANGELOG.txt
dev/modele/implementation/trc6500_chaine_gon/XGon/CHANGELOG.txt
dev/modele/implementation/trc6500_chaine_gon/XGon/src/Version.cpp
dev/modele/implementation/trc6500_chaine_sup/SupCapteur/CHANGELOG.txt
Niry Rakotosalama [Fri, 4 Jul 2014 10:39:37 +0000 (12:39 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into int_tr65_nra_2.3.1
Niry Rakotosalama [Fri, 4 Jul 2014 10:38:19 +0000 (12:38 +0200)]
DCR860 : corrects interface hrgonio evolution impacts new release 0.10.0
updates .deb dependances
Niry Rakotosalama [Fri, 4 Jul 2014 10:27:58 +0000 (12:27 +0200)]
DCR860 : integration of dev branch failed because of interface plot_t changes
increase myccm buffers PLOT and PLOT_ELT
Niry Rakotosalama [Thu, 3 Jul 2014 14:39:14 +0000 (16:39 +0200)]
Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into dev_tr65_nra_ft872_invalid_track_monres
Conflicts:
dev/common/libhrgonio/CHANGELOG.txt
dev/modele/implementation/trc6500_chaine_sup/SupBlade/CHANGELOG.txt
dev/modele/implementation/trc6500_chaine_sup/SupProdData/CHANGELOG.txt
Niry Rakotosalama [Wed, 2 Jul 2014 09:08:37 +0000 (11:08 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_ACA_860_probleme_gestion_alternats_et_reimplementation_taux_activite' into int_tr65_nra_2.3.1
Conflicts:
dev/code_metier/libGonExt/CHANGELOG.txt
Niry Rakotosalama [Wed, 2 Jul 2014 08:48:05 +0000 (10:48 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_ACA_198_parametres_init_statique_donnees_loc_gps' into int_tr65_nra_2.3.1
Alexandre Cazalis (Alten) [Thu, 26 Jun 2014 15:52:40 +0000 (17:52 +0200)]
Merge tag 'LIV_TRC6500_2.3.0' into dev_tr65_ACA_860_probleme_gestion_alternats_et_reimplementation_taux_activite
Alexandre Cazalis (Alten) [Thu, 26 Jun 2014 15:06:57 +0000 (17:06 +0200)]
Merge tag 'LIV_TRC6500_2.3.0' into dev_tr65_ACA_198_parametres_init_statique_donnees_loc_gps
Conflicts:
dev/modele/implementation/trc6500_chaine_gon/GonExt/src/PortMsgSup2GonExt.cpp
Niry Rakotosalama [Wed, 25 Jun 2014 16:25:31 +0000 (18:25 +0200)]
Merge remote-tracking branch 'origin/dev_tr65_nra_ft827_log4cxx' into dev_tr65_nra_ft827_log4cxx
Niry Rakotosalama [Wed, 25 Jun 2014 16:01:18 +0000 (18:01 +0200)]
Merge branch 'int_tr65_nra_2.3' into dev_tr65_nra_ft827_log4cxx
Contains corrections of PCR 852, 864, 870
Conflicts:
dev/modele/debian/SConscript
Alexandre Cazalis (Alten) [Wed, 25 Jun 2014 15:57:08 +0000 (17:57 +0200)]
Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_ACA_860_probleme_gestion_alternats_et_reimplementation_taux_activite
FT863 + minor generation script corrections
Conflicts:
dev/common/libhrgonio/src/svi/alternat.c
Niry Rakotosalama [Wed, 25 Jun 2014 13:40:02 +0000 (15:40 +0200)]
Merge tag 'dev_tr65_tpe_870_01' into int_tr65_nra_2.3
SNMP crash after a blade shutdown
Niry Rakotosalama [Wed, 25 Jun 2014 13:38:02 +0000 (15:38 +0200)]
Merge tag 'dev_tr65_tpe_864_01' into int_tr65_nra_2.3
Alexandre Cazalis (Alten) [Wed, 25 Jun 2014 09:35:16 +0000 (11:35 +0200)]
Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_ACA_198_parametres_init_statique_donnees_loc_gps
FT863 + minor generation script corrections
Conflicts:
dev/modele/debian/script/start_trc6500.sh
Thomas Pérennou (Viveris Technologie) [Tue, 24 Jun 2014 15:08:20 +0000 (17:08 +0200)] 
Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_tpe_852_debian_7.5
FT863 + minor generation script corrections
Conflicts:
.gitignore
Thomas Pérennou (Viveris Technologie) [Tue, 24 Jun 2014 15:03:03 +0000 (17:03 +0200)]
Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_tpe_864_validrzo_linux
FT863 + minor generation script corrections
Conflicts:
.gitignore
Thomas Pérennou (Viveris Technologie) [Tue, 24 Jun 2014 08:35:08 +0000 (10:35 +0200)]
Add core dump limit setting
Thomas Pérennou (Viveris Technologie) [Mon, 23 Jun 2014 17:12:48 +0000 (19:12 +0200)]
Change swm vlan26 IP to 10.133.26.230 (was 232 and in conflict with swg2)
Thomas Pérennou (Viveris Technologie) [Mon, 23 Jun 2014 13:52:59 +0000 (15:52 +0200)]
Disallow client to pass locale environment variables
Niry Rakotosalama [Mon, 23 Jun 2014 09:52:23 +0000 (11:52 +0200)]
Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_nra_ft827_log4cxx
Conflicts:
dev/modele/debian/SConscript
dev/modele/debian/script/start_trc6500.sh
dev/modele/debian_mhf/script/start_trc6500.sh
Thomas Pérennou (Viveris Technologie) [Fri, 20 Jun 2014 14:41:12 +0000 (16:41 +0200)]
Add Update bios configurations
Thomas Pérennou (Viveris Technologie) [Fri, 20 Jun 2014 14:37:12 +0000 (16:37 +0200)]
Fix directory path
Thomas Pérennou (Viveris Technologie) [Fri, 20 Jun 2014 14:20:07 +0000 (16:20 +0200)]
Export locales cause troubles with SNMP perl agent
Alexandre Cazalis (Alten) [Wed, 18 Jun 2014 10:31:11 +0000 (12:31 +0200)]
Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/lgcore6500
Niry Rakotosalama [Tue, 17 Jun 2014 14:28:54 +0000 (16:28 +0200)]
FT863: correct deactivation of FH detection processing
Minor: Ignore exlipse project files
Minor: Correction of generation scripts
Thomas Pérennou (Viveris Technologie) [Mon, 16 Jun 2014 09:35:18 +0000 (11:35 +0200)]
Bashisms hunt
Thomas Pérennou (Viveris Technologie) [Mon, 16 Jun 2014 08:30:51 +0000 (10:30 +0200)]
Add install/tftp directory
Thomas Pérennou (Viveris Technologie) [Thu, 12 Jun 2014 15:03:29 +0000 (17:03 +0200)]
Ignore Eclipse Java project directories (merged from dev_tr65_tpe_864_validrzo_linux)
Thomas Pérennou (Viveris Technologie) [Thu, 12 Jun 2014 13:19:16 +0000 (15:19 +0200)]
Rewrite Java build directories
Thomas Pérennou (Viveris Technologie) [Tue, 10 Jun 2014 13:37:40 +0000 (15:37 +0200)]
Ignore Eclipse Java project directories
Thomas Pérennou (Viveris Technologie) [Tue, 10 Jun 2014 13:15:56 +0000 (15:15 +0200)]
Ignore QtCreator and Eclipse project files
Niry Rakotosalama [Tue, 10 Jun 2014 09:12:50 +0000 (11:12 +0200)]
FT843 : Git migration
- update .gitignore (libspe, serveur_iqrec issue)
niry [Fri, 6 Jun 2014 15:41:50 +0000 (17:41 +0200)] 
Add conditionnement.h lost in Clearcase migration
niry [Fri, 6 Jun 2014 14:16:48 +0000 (16:16 +0200)]
Add common_ewr submodules
compte admin git trc6500 [Fri, 6 Jun 2014 13:44:11 +0000 (15:44 +0200)] 
Import from Clearcase LIV_TRC6500_V2.2.3
element /tmp/c_trc6m5/TRC6500/... /main/int_trc6500_v2.3_001/LATEST
element /tmp/c_trc6m5/TRC6500/... /main/LIV_TRC6500_V2.2.3 -mkbranch int_trc6500_v2.3_001
element /tmp/c_trc6m5/TRC6500/... /main/LATEST -mkbranch int_trc6500_v2.3_001
Soft'N'Design Software / projects / debian6500.git / log
