Merge branch 'v1.3.14-rc'
Conflicts:
README
client/conf/version
client/lib/Makefile
collect/scripts/collect/inep/number.int
collect/scripts/collect/mac-address.tree
collect/scripts/collect/mac-address/number.string
scripts/collect/inep/number.int
Signed-off-by: 
Erik Alexandre Pucci <eap08@c3sl.ufpr.br>
No related branches found
No related tags found
Showing
- buildpackage/bootstraps/bootstrap-install 10 additions, 2 deletionsbuildpackage/bootstraps/bootstrap-install
- buildpackage/bootstraps/bootstrap-update 3 additions, 1 deletionbuildpackage/bootstraps/bootstrap-update
- client/common.sh 1 addition, 2 deletionsclient/common.sh
- client/conf/version 1 addition, 1 deletionclient/conf/version
- client/lib/Makefile 14 additions, 6 deletionsclient/lib/Makefile
- client/run-config.sh 1 addition, 1 deletionclient/run-config.sh
- collect/integrity-checker.sh 2 additions, 3 deletionscollect/integrity-checker.sh
- collect/scripts/collect/agent/version.string 4 additions, 16 deletionscollect/scripts/collect/agent/version.string
- collect/scripts/collect/inventory/disk.tree 4 additions, 1 deletioncollect/scripts/collect/inventory/disk.tree
- collect/scripts/collect/mac-address.tree 27 additions, 0 deletionscollect/scripts/collect/mac-address.tree
Loading
Please register or sign in to comment