Merge lp://qastaging/~noskcaj/ubuntu/trusty/libstatgrab/merge into lp://qastaging/ubuntu/trusty/libstatgrab
Proposed by
Jackson Doak
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~noskcaj/ubuntu/trusty/libstatgrab/merge |
Merge into: | lp://qastaging/ubuntu/trusty/libstatgrab |
Diff against target: |
155588 lines (+98901/-40896) 245 files modified
.pc/.quilt_patches (+0/-1) .pc/.quilt_series (+0/-1) .pc/.version (+0/-1) .pc/applied-patches (+0/-1) .pc/manpage/docs/saidar/saidar.1 (+0/-50) AUTHORS (+1/-0) ChangeLog (+10330/-4917) INSTALL (+173/-40) Makefile.am (+21/-6) Makefile.in (+357/-167) NEWS (+14/-2) PLATFORMS (+22/-49) README (+29/-10) acinclude.m4 (+0/-72) aclocal.m4 (+794/-6861) ar-lib (+270/-0) config.guess (+326/-294) config.h.in (+833/-23) config.sub (+235/-105) configure (+21835/-17496) configure.ac (+1787/-0) configure.in (+0/-261) debian/changelog (+17/-0) debian/compat (+1/-1) debian/control (+6/-5) debian/libstatgrab-dev.install (+4/-4) debian/libstatgrab6.dirs (+0/-1) debian/libstatgrab6.install (+0/-1) debian/libstatgrab9.dirs (+1/-0) debian/libstatgrab9.install (+1/-0) debian/patches/manpage (+0/-28) debian/patches/series (+0/-1) debian/rules (+1/-1) depcomp (+264/-66) docs/Makefile.am (+1/-1) docs/Makefile.in (+225/-104) docs/libstatgrab/Makefile.am (+85/-14) docs/libstatgrab/Makefile.in (+274/-82) docs/libstatgrab/libstatgrab.3 (+715/-0) docs/libstatgrab/sg_clear_error.3 (+76/-0) docs/libstatgrab/sg_comp_destroy.3 (+405/-0) docs/libstatgrab/sg_comp_get_tls.3 (+405/-0) docs/libstatgrab/sg_comp_init.3 (+405/-0) docs/libstatgrab/sg_disk_io_compare_name.3 (+232/-0) docs/libstatgrab/sg_disk_io_compare_traffic.3 (+232/-0) docs/libstatgrab/sg_drop_privileges.3 (+83/-0) docs/libstatgrab/sg_free_cpu_stats.3 (+239/-0) docs/libstatgrab/sg_free_disk_io_stats.3 (+232/-0) docs/libstatgrab/sg_free_fs_stats.3 (+386/-0) docs/libstatgrab/sg_free_host_info.3 (+144/-0) docs/libstatgrab/sg_free_load_stats.3 (+117/-0) docs/libstatgrab/sg_free_mem_stats.3 (+205/-0) docs/libstatgrab/sg_free_network_iface_stats.3 (+174/-0) docs/libstatgrab/sg_free_network_io_stats.3 (+232/-0) docs/libstatgrab/sg_free_page_stats.3 (+156/-0) docs/libstatgrab/sg_free_process_count.3 (+450/-0) docs/libstatgrab/sg_free_stats_buf.3 (+386/-0) docs/libstatgrab/sg_free_swap_stats.3 (+205/-0) docs/libstatgrab/sg_free_user_stats.3 (+140/-0) docs/libstatgrab/sg_fs_compare_device_name.3 (+386/-0) docs/libstatgrab/sg_fs_compare_mnt_point.3 (+386/-0) docs/libstatgrab/sg_get_cpu_percents.3 (+209/-57) docs/libstatgrab/sg_get_cpu_percents_of.3 (+239/-0) docs/libstatgrab/sg_get_cpu_percents_r.3 (+239/-0) docs/libstatgrab/sg_get_cpu_stats.3 (+209/-57) docs/libstatgrab/sg_get_cpu_stats_diff.3 (+209/-57) docs/libstatgrab/sg_get_cpu_stats_diff_between.3 (+239/-0) docs/libstatgrab/sg_get_cpu_stats_r.3 (+239/-0) docs/libstatgrab/sg_get_disk_io_stats.3 (+198/-52) docs/libstatgrab/sg_get_disk_io_stats_diff.3 (+198/-52) docs/libstatgrab/sg_get_disk_io_stats_diff_between.3 (+232/-0) docs/libstatgrab/sg_get_disk_io_stats_r.3 (+232/-0) docs/libstatgrab/sg_get_error.3 (+147/-0) docs/libstatgrab/sg_get_error_arg.3 (+147/-0) docs/libstatgrab/sg_get_error_details.3 (+147/-0) docs/libstatgrab/sg_get_error_errno.3 (+147/-0) docs/libstatgrab/sg_get_fs_stats.3 (+365/-82) docs/libstatgrab/sg_get_fs_stats_diff.3 (+386/-0) docs/libstatgrab/sg_get_fs_stats_diff_between.3 (+386/-0) docs/libstatgrab/sg_get_fs_stats_r.3 (+386/-0) docs/libstatgrab/sg_get_host_info.3 (+120/-31) docs/libstatgrab/sg_get_host_info_r.3 (+144/-0) docs/libstatgrab/sg_get_load_stats.3 (+91/-16) docs/libstatgrab/sg_get_load_stats_r.3 (+117/-0) docs/libstatgrab/sg_get_mem_stats.3 (+180/-54) docs/libstatgrab/sg_get_mem_stats_r.3 (+205/-0) docs/libstatgrab/sg_get_nelements.3 (+386/-0) docs/libstatgrab/sg_get_network_iface_stats.3 (+137/-32) docs/libstatgrab/sg_get_network_iface_stats_r.3 (+174/-0) docs/libstatgrab/sg_get_network_io_stats.3 (+192/-62) docs/libstatgrab/sg_get_network_io_stats_diff.3 (+192/-62) docs/libstatgrab/sg_get_network_io_stats_diff_between.3 (+232/-0) docs/libstatgrab/sg_get_network_io_stats_r.3 (+232/-0) docs/libstatgrab/sg_get_page_stats.3 (+133/-28) docs/libstatgrab/sg_get_page_stats_diff.3 (+133/-28) docs/libstatgrab/sg_get_page_stats_diff_between.3 (+156/-0) docs/libstatgrab/sg_get_page_stats_r.3 (+156/-0) docs/libstatgrab/sg_get_process_count.3 (+372/-113) docs/libstatgrab/sg_get_process_count_of.3 (+450/-0) docs/libstatgrab/sg_get_process_count_r.3 (+450/-0) docs/libstatgrab/sg_get_process_stats.3 (+372/-113) docs/libstatgrab/sg_get_process_stats_r.3 (+450/-0) docs/libstatgrab/sg_get_swap_stats.3 (+180/-54) docs/libstatgrab/sg_get_swap_stats_r.3 (+205/-0) docs/libstatgrab/sg_get_user_stats.3 (+126/-22) docs/libstatgrab/sg_get_user_stats_r.3 (+140/-0) docs/libstatgrab/sg_get_valid_filesystems.3 (+386/-0) docs/libstatgrab/sg_global_lock.3 (+405/-0) docs/libstatgrab/sg_global_unlock.3 (+405/-0) docs/libstatgrab/sg_init.3 (+83/-0) docs/libstatgrab/sg_internal-intro.3 (+45/-0) docs/libstatgrab/sg_intro.3 (+130/-0) docs/libstatgrab/sg_lock_mutex.3 (+58/-0) docs/libstatgrab/sg_network_iface_compare_name.3 (+174/-0) docs/libstatgrab/sg_network_io_compare_name.3 (+232/-0) docs/libstatgrab/sg_process_compare_cpu.3 (+450/-0) docs/libstatgrab/sg_process_compare_gid.3 (+450/-0) docs/libstatgrab/sg_process_compare_name.3 (+450/-0) docs/libstatgrab/sg_process_compare_pid.3 (+450/-0) docs/libstatgrab/sg_process_compare_res.3 (+450/-0) docs/libstatgrab/sg_process_compare_size.3 (+450/-0) docs/libstatgrab/sg_process_compare_time.3 (+450/-0) docs/libstatgrab/sg_process_compare_uid.3 (+450/-0) docs/libstatgrab/sg_prove_vector.3 (+386/-0) docs/libstatgrab/sg_set_error.3 (+76/-0) docs/libstatgrab/sg_set_error_with_errno.3 (+76/-0) docs/libstatgrab/sg_set_error_with_errno_code.3 (+76/-0) docs/libstatgrab/sg_set_valid_filesystems.3 (+386/-0) docs/libstatgrab/sg_shutdown.3 (+83/-0) docs/libstatgrab/sg_snapshot.3 (+83/-0) docs/libstatgrab/sg_str_error.3 (+147/-0) docs/libstatgrab/sg_strperror.3 (+147/-0) docs/libstatgrab/sg_unlock_mutex.3 (+58/-0) docs/libstatgrab/sg_vector_clear.3 (+386/-0) docs/libstatgrab/sg_vector_clone.3 (+386/-0) docs/libstatgrab/sg_vector_clone_into.3 (+386/-0) docs/libstatgrab/sg_vector_compute_diff.3 (+386/-0) docs/libstatgrab/sg_vector_create.3 (+386/-0) docs/libstatgrab/sg_vector_free.3 (+386/-0) docs/libstatgrab/sg_vector_resize.3 (+386/-0) docs/libstatgrab/statgrab.3 (+695/-91) docs/saidar/Makefile.am (+8/-5) docs/saidar/Makefile.in (+205/-73) docs/saidar/saidar.1 (+30/-14) docs/statgrab/Makefile.am (+8/-5) docs/statgrab/Makefile.in (+206/-74) docs/statgrab/statgrab-make-mrtg-config.1 (+27/-11) docs/statgrab/statgrab-make-mrtg-index.1 (+25/-9) docs/statgrab/statgrab.1 (+45/-29) examples/Makefile.am (+14/-7) examples/Makefile.in (+223/-83) examples/cpu_usage.c (+51/-15) examples/disk_traffic.c (+37/-45) examples/filesys_snapshot.c (+71/-0) examples/helpers.c (+157/-0) examples/helpers.h (+36/-0) examples/load_stats.c (+24/-10) examples/network_iface_stats.c (+14/-13) examples/network_traffic.c (+55/-67) examples/os_info.c (+33/-15) examples/page_stats.c (+27/-12) examples/process_snapshot.c (+27/-24) examples/process_stats.c (+27/-13) examples/user_list.c (+29/-14) examples/valid_filesystems.c (+61/-0) examples/vm_stats.c (+25/-21) install-sh (+23/-15) libstatgrab.pc.in (+1/-1) ltmain.sh (+6562/-3812) m4/ax_lib.m4 (+270/-0) m4/ax_ncurses.m4 (+52/-0) m4/ax_perl5.m4 (+62/-0) m4/ax_pthread.m4 (+324/-0) m4/ax_shellvars.m4 (+53/-0) m4/ax_types.m4 (+147/-0) m4/ax_visibility.m4 (+93/-0) m4/ax_win32.m4 (+28/-0) m4/ax_xopen.m4 (+210/-0) m4/libtool.m4 (+7982/-0) m4/ltoptions.m4 (+384/-0) m4/ltsugar.m4 (+123/-0) m4/ltversion.m4 (+23/-0) m4/lt~obsolete.m4 (+98/-0) missing (+73/-110) src/Makefile.am (+1/-1) src/Makefile.in (+225/-104) src/libstatgrab/Makefile.am (+12/-13) src/libstatgrab/Makefile.in (+229/-88) src/libstatgrab/cpu_stats.c (+533/-227) src/libstatgrab/disk_stats.c (+1754/-824) src/libstatgrab/error.c (+253/-43) src/libstatgrab/error.h (+69/-0) src/libstatgrab/globals.c (+529/-0) src/libstatgrab/globals.h (+453/-0) src/libstatgrab/load_stats.c (+71/-81) src/libstatgrab/memory_stats.c (+342/-242) src/libstatgrab/network_stats.c (+1071/-586) src/libstatgrab/os_info.c (+474/-219) src/libstatgrab/page_stats.c (+202/-160) src/libstatgrab/process_stats.c (+1340/-743) src/libstatgrab/statgrab.h (+272/-105) src/libstatgrab/statgrab.h.in (+476/-0) src/libstatgrab/statgrab_deprecated.c (+0/-102) src/libstatgrab/statgrab_deprecated.h (+0/-91) src/libstatgrab/swap_stats.c (+306/-170) src/libstatgrab/tools.c (+391/-237) src/libstatgrab/tools.h (+541/-43) src/libstatgrab/trace.h (+146/-0) src/libstatgrab/user_stats.c (+310/-124) src/libstatgrab/vector.c (+339/-38) src/libstatgrab/vector.h (+134/-44) src/libstatgrab/win32.c (+36/-6) src/libstatgrab/win32.h (+0/-1) src/saidar/Makefile.am (+5/-4) src/saidar/Makefile.in (+209/-81) src/saidar/saidar.c (+272/-54) src/statgrab/Makefile.am (+5/-4) src/statgrab/Makefile.in (+257/-89) src/statgrab/statgrab-make-mrtg-config.in (+2/-2) src/statgrab/statgrab-make-mrtg-index.in (+2/-2) src/statgrab/statgrab.c (+447/-142) tests/Makefile.am (+15/-0) tests/Makefile.in (+618/-0) tests/multi_threaded/Makefile.am (+60/-0) tests/multi_threaded/Makefile.in (+639/-0) tests/multi_threaded/diff_stats.c (+228/-0) tests/multi_threaded/full_stats.c (+228/-0) tests/multi_threaded/libstatgrab-test.properties (+6/-0) tests/multi_threaded/run_tests.synopsis.in (+9/-0) tests/single_threaded/Makefile.am (+60/-0) tests/single_threaded/Makefile.in (+639/-0) tests/single_threaded/diff_stats.c (+102/-0) tests/single_threaded/full_stats.c (+102/-0) tests/single_threaded/libstatgrab-test.properties (+6/-0) tests/single_threaded/run_tests.synopsis.in (+5/-0) tests/testlib/Makefile.am (+15/-0) tests/testlib/Makefile.in (+561/-0) tests/testlib/err.c (+101/-0) tests/testlib/mix_tests.pm (+98/-0) tests/testlib/mk_run_tests.pl (+58/-0) tests/testlib/opt.c (+90/-0) tests/testlib/routines.c (+221/-0) tests/testlib/run_tests.pm (+194/-0) tests/testlib/run_tests.t.in (+77/-0) tests/testlib/testlib.h (+78/-0) |
To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/libstatgrab/merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Needs Fixing | ||
Review via email:
|
Description of the change
Merge from debian. Overrides https:/
To post a comment you must log in.
Unmerged revisions
- 12. By Jackson Doak
-
* Add mising build-dep on pkg-config, needed for autoreconf
- 11. By Jackson Doak
-
* Merge from debian. Remaining change:
- Use dh-autoreconf for ppc64el
Thanks. Uploaded