summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
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
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
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
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
