[icinga-checkins] icinga.org: New commits on branch dev/cgis

git at icinga.org git at icinga.org
Tue Nov 15 10:19:48 CET 2011


URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=757cf74c807bde7fcdd897d258dd039ea5878c9a
Merge: 3b8a26926857b931a2c295f31d0ee52a3a8b575e d01dd67da59166fce660c0c4778f325fec08197a
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Nov 15 10:19:06 2011 +0100

    Merge branch 'r1.6' into mfriedrich/cgis

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=d01dd67da59166fce660c0c4778f325fec08197a
Merge: e07946a794c4c266974914b1d0a06cb5b9368914 ac44aeaaa8a41583f6ff8964acfebb5fb7075b1b
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Nov 15 10:06:07 2011 +0100

    Merge branch 'test/core' into r1.6

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=ac44aeaaa8a41583f6ff8964acfebb5fb7075b1b
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Nov 15 10:05:05 2011 +0100

    correct db schema version in mysql and pgsql upgrade scripts

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=eec29ab69e62a980bbf0e7ef739d1e30fa76bb67
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Nov 15 09:59:07 2011 +0100

    fix mysql-upgrade-1.6.0.sql ,

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=e07946a794c4c266974914b1d0a06cb5b9368914
Merge: d2a802e26d0c20999aa5caa94568ddbc46c44731 66ac0856edbf45184a2063fe39641ae265a08e07
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 14 17:35:30 2011 +0100

    Merge branch 'test/core' into r1.6

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=66ac0856edbf45184a2063fe39641ae265a08e07
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 14 17:33:53 2011 +0100

    fix regex match for update-version

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=d2a802e26d0c20999aa5caa94568ddbc46c44731
Merge: 21f0aa8e4e07db7b88791135a3f051618fbfa219 d60ff7c853a60349be2b1a264202a5b1e40b54de
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 14 11:06:26 2011 +0100

    Merge branch 'test/core' into r1.6

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=d60ff7c853a60349be2b1a264202a5b1e40b54de
Merge: 48673d407fc245ff3bef2e0872bc55fe0fb437b0 7ae6a89e7860f619dc1282ca6e2fef6a136bef74
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 14 11:04:32 2011 +0100

    Merge branch 'mfriedrich/core' of git.icinga.org:icinga-core into mfriedrich/core

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=48673d407fc245ff3bef2e0872bc55fe0fb437b0
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 14 11:01:26 2011 +0100

    rework the version updates in icinga and idoutils
    
    * remove version from icinga.c/icingastats.c header
    * drop all IDO*_DATE|VERSION, use IDO_DATE|VERSION
    * introduce IDO_COPYRIGHT|LICENSE to be used in output and logs
    * move all shared ido information to module/idoutils/include/commonh.
    * move IDO2DB_SCHEMA_VERSION to IDO_SCHEMA_VERSION
    * update update-version and update-version-schema
    
    this makes the version updates a bit more sharp, and less
    work for developers/release managers

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=21f0aa8e4e07db7b88791135a3f051618fbfa219
Merge: 69d1570c9067f46491640436e14a3c3186a52770 7ae6a89e7860f619dc1282ca6e2fef6a136bef74
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 14 09:25:27 2011 +0100

    Merge branch 'test/core' into r1.6

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=69d1570c9067f46491640436e14a3c3186a52770
Merge: 653095dfe180f43e3cf92b95115b3c2442975a8b c2bbe9e3f85f83ad2cdfbcc3bc2fa85854d461f2
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 14 09:25:20 2011 +0100

    Merge branch 'test/cgis' into r1.6

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=653095dfe180f43e3cf92b95115b3c2442975a8b
Merge: 41367a60a9f5f4ce2214367089e7bd82abb32176 edb02ba588f51c265d2827f6582903236c270e41
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 14 09:24:03 2011 +0100

    Merge branch 'dev/ido' into test/ido

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=edb02ba588f51c265d2827f6582903236c270e41
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Nov 10 15:47:58 2011 +0100

    * idoutils: add max_notifications_age, max_contactnotifications_age, max_contactnotificationmethods_age as housekeeping for notification tables #2051
    
    refs #2051

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=7ae6a89e7860f619dc1282ca6e2fef6a136bef74
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Nov 10 15:17:43 2011 +0100

    core: fix memory leak in xodtemplate.c (thx Dorian Guillois)

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=c970c46f0586c1348415306b179c430c05220bef
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Nov 10 13:50:42 2011 +0100

    flag r1.6 as 1.6.0 again

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=49d8826a637acd2f84157c227ab586dc2b2f3917
Merge: bf86474d15d5668bef266ed303b32d57424144f7 6697aa0b70345d68c262bf3e4be7ae14b7e4f9ea
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Nov 9 16:41:47 2011 +0100

    Merge branch 'test/core' into r1.6
    
    Conflicts:
    	Changelog

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=bf86474d15d5668bef266ed303b32d57424144f7
Merge: 15b91ef2ced9d45473d2238de4bb8366fa46a5eb 46a1e76b99f024ae1de60de13fdf1afe36d76160
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Nov 9 16:41:03 2011 +0100

    Merge branch 'test/cgis' into r1.6

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=6697aa0b70345d68c262bf3e4be7ae14b7e4f9ea
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Nov 9 13:08:54 2011 +0100

    * core: make first_notification_delay depend on the first !OK hard state change and don't reset timer for new hard states which would replace it #1918
    
    refs #1918
    refs #2048

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=124eb0df0b17dd8177c69ff45341ba098eb79eb5
Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Tue Oct 25 13:39:38 2011 +0200

    Implemented eventloop mutex.
    
    This will be used by IcingaMQ to make sure that no other thread
    is running any Icinga code while executing API commands.
    
    Refs #2040

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=a088dc185a563c771d5872f1f0ada0cef6762466
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 7 10:28:48 2011 +0100

    Revert "Adding ido2db_proc function"
    
    This reverts commit 76e77168f11c80db972501f1dd7d94509e0f5d28.

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=559a99cda978d85edbb4ea6a57c4fa2be66cd877
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 7 10:25:06 2011 +0100

    Revert "modifications to init scripts"
    
    This reverts commit 5bbc81f7315c66cdae5ce9cecc97ed76123c475b.
    
    Conflicts:
    
    	daemon-init.in

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=f5acedcf15ca9ba0cd47e87cac5dba5b269cf6f8
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 7 10:24:07 2011 +0100

    Revert "Modify the 'ps' flags to accomodate diffrenaces between *nix flavours"
    
    This reverts commit e80a1d90428bdad4eb734bce9c9d650cf2968c28.

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=eacd0a95389eee34945d48feba3c5c3de5efe372
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 7 10:23:42 2011 +0100

    Revert "change position of the IcingaPid param declaration to make sure is populated before used."
    
    This reverts commit 4504357eae98d90396d9a62948cacc34b09b0538.

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=f7a69e8b0423db3c0083e6fc16324508be3bd8b8
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 7 10:13:40 2011 +0100

    fix slashistory acknowledgement_time timestamp default

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=baca064194ba279b62b377388905e45ac2cb1914
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 7 09:55:24 2011 +0100

    create objects dir if not yet created on idoutils install

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=53f0262de5eaf993d696d367e62afc10bb7574ff
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Nov 6 10:33:43 2011 +0100

    update icinga.spec for 1.6 #2039
    
    refs #2039

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=5359b579304de1a58ef0921757d96221dc415724
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Nov 6 09:39:35 2011 +0100

    corrent ident in base/notifications.c

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=5bf7326bfd8e78e161d347e46851aa603c599118
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Nov 4 14:59:30 2011 +0100

    add quotes to -z tests from ps checks in init script

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=b7638b1890429cfb4f017c1447a9a645a75dd922
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Nov 4 14:47:27 2011 +0100

    move ido2db_check_proc.cfg to idoutils config location again, split from core
    
    refs #1870

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=6c9ce2b9373fe2b807d752dc34e3ff087e2a2d0f
Merge: 6ef32119eb7fd8125395d0882ac638fafbddf44c 4504357eae98d90396d9a62948cacc34b09b0538
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Nov 4 14:38:33 2011 +0100

    Merge branch 'aflatto/ido' into mfriedrich/core

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=4504357eae98d90396d9a62948cacc34b09b0538
Author: Assaf Flatto <icinga at flatto.net>
Date:   Fri Nov 4 13:35:16 2011 +0000

    change position of the IcingaPid param declaration to make sure is populated before used.

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=6ef32119eb7fd8125395d0882ac638fafbddf44c
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Nov 4 09:40:53 2011 +0100

    move ido2db process checks to contrib/checks, install to objects but don't include by default
    
    refs #1870

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=0927858491917d3e227088422dcbea43e3170915
Merge: 176280226f558f34923117cc4cc24d791d9f7213 e80a1d90428bdad4eb734bce9c9d650cf2968c28
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Nov 4 09:27:36 2011 +0100

    Merge branch 'aflatto/ido' into mfriedrich/core
    
    Conflicts:
    	Changelog

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=41367a60a9f5f4ce2214367089e7bd82abb32176
Merge: 75fa8c3fe9039c5309d1d4351987bda9b3c2e767 3b5fc3b97e7a32d06dddc134897d83e2ce541cfe
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Nov 2 10:43:24 2011 +0100

    Merge branch 'test/ido' of git.icinga.org:icinga-core into test/ido

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=176280226f558f34923117cc4cc24d791d9f7213
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Nov 1 11:42:13 2011 +0100

    * core: add notifications to stalking hosts/services, not only logging/event handlers #1367
    
    for further details, please refer to
    https://dev.icinga.org/issues/1367
    
    refs #1367

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=90d2c7a19e3dc1369284f9016f6d30f75fc10cf6
Merge: 348a795721ff39397a539657cb2e87a96ef2dd32 15b91ef2ced9d45473d2238de4bb8366fa46a5eb
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Oct 31 14:43:03 2011 +0100

    Merge branch 'r1.6' into mfriedrich/core
    
    Conflicts:
    	Changelog

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=15b91ef2ced9d45473d2238de4bb8366fa46a5eb
Merge: 39ac93a1e46bb3212cb795eb4380b64d455aef63 3b5fc3b97e7a32d06dddc134897d83e2ce541cfe
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Oct 31 13:48:42 2011 +0100

    Merge branch 'test/ido' into r1.6

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=3b5fc3b97e7a32d06dddc134897d83e2ce541cfe
Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Mon Oct 31 09:16:15 2011 +0100

    Replace fprintf() with ido2db_log_debug_info().
    
    refs #2037

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=c3e0acff62e0ef592d2f4bf89daf966129d7fef1
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Oct 28 15:45:21 2011 +0200

    rework sla zeugs to fit coding policy and stays disabled by default
    
    refs #2037

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=46e92c2b0738bca2f9df7a181a7510fc39a26d31
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Oct 28 13:45:57 2011 +0200

    format sla code with current indent style

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=e80a1d90428bdad4eb734bce9c9d650cf2968c28
Author: Assaf Flatto <icinga at flatto.net>
Date:   Fri Oct 28 10:13:46 2011 +0100

    Modify the 'ps' flags to accomodate diffrenaces between *nix flavours

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=0bb69173a639c42679917acf9c9d567ddf48a8c1
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Fri Oct 28 09:00:31 2011 +0200

    idoutils: fix slahistory related issues in oracle code

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=c62937ea3faa082eaec2e52bab84b15bc259e71d
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Thu Oct 27 22:27:42 2011 +0200

    idoutils: replace date fields with timestamps, store dates as UTC #1954
    refs #1954

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=5bbc81f7315c66cdae5ce9cecc97ed76123c475b
Author: Assaf Flatto <icinga at flatto.net>
Date:   Tue Oct 25 11:12:10 2011 +0100

    modifications to init scripts

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=348a795721ff39397a539657cb2e87a96ef2dd32
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Oct 22 20:09:37 2011 +0200

    add more comments and thoughts to timperiods, dst handling and checking for the next valid time #1782
    
    refs #1782

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=c87602986e71d5a15ddd5d0de96e0c3bc6992b40
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Oct 22 16:52:24 2011 +0200

    core: determine last_program_stop from creation of retention.dat and use that for decision if passive checks are fresh or not (Andreas Ericsson) #2027
    
    please check the issue for deeper analysis and description.
    https://dev.icinga.org/issues/2027
    
    refs #2027

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=205f72e17f2b6bf58aaf52175ece694ffe3d4423
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Oct 22 15:28:26 2011 +0200

    * core: protect downtime and comment list modification with a lock (Andreas Ericsson) #2025
    
    this will prevent multiple threads from fetching
    the comment and downtime lists in memory
    competing about pointers and leading into
    possible segfaults then.
    
    modules that need to issue the lock themselves must
    import its declaration first and then manipulate the
    lock without using the locking core apis.
    
    icinga_downtime_lock
    icinga_comment_lock
    
    refs #2025

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=39d49d25b3e81e356b0c6c63bf496c50ef584d83
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Oct 22 14:52:08 2011 +0200

    * core: split long change comments into multiline comments (nice catch by Andreas Ericsson)

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=2f789eeddea6807d837e63775e3f37fa4c448ae2
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Oct 22 14:44:58 2011 +0200

    make inden.sh a bit more flexible allowing multiple files to be passed (Andreas Ericsson)
    
    keeping indent intact, nice catchup.

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=76e77168f11c80db972501f1dd7d94509e0f5d28
Author: assaf <assaf at AikiLinux-laptop.(none)>
Date:   Thu Oct 6 10:37:15 2011 +0100

    Adding ido2db_proc function

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=75fa8c3fe9039c5309d1d4351987bda9b3c2e767
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Oct 1 21:29:04 2011 +0200

    move location of debug log lock in idomod





More information about the icinga-checkins mailing list