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

git at icinga.org git at icinga.org
Sat Feb 25 13:03:57 CET 2012


URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=d477d4564ac3c9cf62da0ccba8c0b9558d60717b
Merge: 2d6168b28d65ee01d4efe81701ca2cb8fce7b8f4 a22564f0dd92b027ad999a3ae9cda1494cf6f6c9
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Feb 22 10:46:07 2012 +0100

    Merge branch 'test/cgis' into next

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=2d6168b28d65ee01d4efe81701ca2cb8fce7b8f4
Merge: ec5e9f6a0c3b5a65dc4e1ffecf1c176e894fdeb1 62344c3db36f0b392dc1476d279866f23c922a20
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Feb 22 10:44:23 2012 +0100

    Merge branch 'test/ido' into next
    
    Conflicts:
    	Changelog
    	configure
    	docbook

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=ec5e9f6a0c3b5a65dc4e1ffecf1c176e894fdeb1
Merge: 0b7009c658f304080f69a113c49e1d5d249b9e53 c440478b44d13e79da4db5bd5a2a984ab0573833
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Feb 22 10:39:40 2012 +0100

    Merge branch 'test/core' into next

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=62344c3db36f0b392dc1476d279866f23c922a20
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Feb 18 18:23:41 2012 +0100

    idoutils: change standard string escaping for postgresql queries to use the E'foo' notation #1974
    
    refs #1974

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=e586b345326ad2dd9b40cfbd633d73d16bbbd641
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Feb 18 11:38:06 2012 +0100

    idoutils: fix ORA-00913 too many values when MERGE INTO eventhandlers #2319
    
    refs #2319

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=c440478b44d13e79da4db5bd5a2a984ab0573833
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Feb 17 22:25:11 2012 +0100

    core: fix handling of allow_empty_hostgroup_assignment when hitting NULL'edhost_name attribute, now properly finishing #949
    
    previously we were checking if host_name attribute was NULL, warning the
    user about that and then looping to the objects_skiplist_insert and
    finally erroring out due to wrongly to-be-registered incomplete object.
    this is now fixed for both, the default is an error, using
    allow_empty_hostgroup_assignment will now discard the warning and
    ignoring the object.
    
    oh, and updated the config description a bit, to tell where this
    functionality is useful (and somewhat not to do some object tricks like
    people tried to do and bug report then...)
    
    refs #949

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=1e886e3d030456ea525798c408a2a202e2369543
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Feb 13 18:18:42 2012 +0100

    fix tests in t-tap
    
    * various variable stubs were missing (stalking notifications, ack with expiry)
    * various function stubs were missing (ack with expiry)
    * cgiutils.c should be main src for variables (readlogs.c must use extern!), keeping the list of to-be-added-vars to test_xsddefault.c small
    * cgi/Makefile.in and t-tap/Makefile.in should be aware of make changes to each other (readlogs.o was missing, preventing clean builds)
    
    * if you *ever* change the building structure, make sure tests run fine!

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=fa2a839b524526ba096ea2c9b7c435d484b60292
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Feb 8 22:32:57 2012 +0100

    quickfix resource.cfg text for count of $USERn$ macros, it's 256

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=71e4ef79e705b3fa31deb6757ba8c08b65641e82
Merge: e9a652c79757ebb8a6e6e80a30cd398c77139f77 b625b21a27fab7c7fcc51b7958169ad59bb2b2d0
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Mon Feb 6 15:53:24 2012 +0100

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

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=e9a652c79757ebb8a6e6e80a30cd398c77139f77
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Jan 27 12:23:01 2012 +0100

    debug: set debug_verbosity=2 by default #2236
    
    refs #2236

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=d8dd9b13e613095fcee7c528668ae6f602879af1
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Jan 16 13:40:53 2012 +0100

    fix unsafe null ptr passed to debug log, segfault on solaris #2271
    
    refs #2271

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=62754f521676debbb17c67f07fa84b2e3741d6f9
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Sun Feb 5 19:11:48 2012 +0100

    idoutils: replace sensless debug output with syslog when ido2db starts without logfile open

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=575815ae430177ff4964e530ec33d4cd439b920b
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Sun Feb 5 18:59:31 2012 +0100

    idoutils: fix for oracle clob issue #2303
    refs #2303

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=0b7009c658f304080f69a113c49e1d5d249b9e53
Merge: f25af349caffd8cd85f06dccda2c1e0e3147993c 4951e409053e3a7e0445b827886da990d414ab8c
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Feb 5 14:19:25 2012 +0100

    Merge branch 'test/cgis' into next
    
    Conflicts:
    	Changelog

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=f25af349caffd8cd85f06dccda2c1e0e3147993c
Merge: 9532a10ec453cb189d3a499a8c9635a6d777eba8 7204647bdd2b26642562c68f390cfc1b826937fa
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Feb 5 14:12:29 2012 +0100

    Merge branch 'test/core' into next

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=7204647bdd2b26642562c68f390cfc1b826937fa
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Feb 5 13:48:46 2012 +0100

    * core: mark services as executing only when we know we will actually run them (Andreas Ericsson) #2302
    
    currently, the neb callback override happens after
    marking the check being executed. if the neb callback
    does not take care of resolving this issue itsself,
    the service check would never be rescheduled then.
    
    refs #2302

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=5529ef6e284f41f503d23fe659ad66b1b648730a
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Feb 5 12:48:06 2012 +0100

    * core: allow empty host groups in service and host dependencies if allow_empty_hostgroup_assignment flag is set (Daniel Wittenberg) #2255
    
    refs #2255

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=ee2fe6bb430fadacdaf777efceb2a6fd451ed7df
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Feb 5 12:35:16 2012 +0100

    core: apply patch from #2292
    
    refs #2292

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=96d9c51dbcd0becf2da8876d2a4b42a624554841
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Sun Feb 5 10:00:11 2012 +0100

    idoutils: apply idomod patch contributed in #2292 for gcc2.95 compatibility
    refs #2292

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=76ecd0266ac73e9ef2b49a50fcb331d38aabc51c
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Sun Feb 5 09:49:05 2012 +0100

    idoutils: change snprintf prototype assignments, fix unwanted delete of snprintf.h #2271
    refs #2271

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=a7a9dd5401f49d06cf13e3645ebddab7269b0cf3
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Fri Feb 3 20:56:08 2012 +0100

    idoutils,core: add snprintf.h static header with definitions for configure time missed functions now available in snprintf.c .this fixes a lot of compiler warnings about undefined symbols
    refs #1253

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=543952f20195736c6722903ea2bc602501f8fecd
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Fri Feb 3 20:42:33 2012 +0100

    idoutils logging: Fix non gcc compiler problems with gnu extension __printf__ #1253
    refs #1253

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=2256b95874b5eead76b7aef2a68d9f7b90858a68
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Fri Feb 3 20:32:51 2012 +0100

    idoutils: replace direct write with vfprintf with gnu vasprint/fprintf, which take care about null pointer arguments causing SEGV in Solaris #2271
    refs #2271

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=44111b711c9747db70ca676aef619f60ff78c14a
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Fri Feb 3 20:09:57 2012 +0100

    idoutils: fix typo in sql #2274
    refs #2274

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=bf01139381a0fcdeb84cc7ee70871471d84f7f89
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Fri Feb 3 20:04:41 2012 +0100

    idoutils: fix typo in oracle upgrade script, add using previous tbs defines

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=06a7deee64a2c5d9c53b64c1eac2e86a6f439dbb
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Sun Jan 29 17:17:35 2012 +0100

    fix build issues on modules and broken snprintf function causing segv on solaris #1772
    refs #1772, #1253

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=69e8bd7c1a5000b70965690813ed89a431ee8a25
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Sun Jan 29 17:15:42 2012 +0100

    idoutils: add index for BP Addon #2274
    refs #2274

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=3cc9709385546e6c7a70f8466c874734354a3877
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Sun Jan 29 16:39:39 2012 +0100

    idoutils: fix %lld compiler warning in logging.c

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=f60cb48e9f64b1dddc9a8c40748e1483ef2b6b90
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Sun Jan 29 16:06:28 2012 +0100

    idoutils: check for oracle driver: temporary initialize ocilib to get runtime version (replaces previous fix)

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=eab8f03f26d1ba335f65558cf009fd5229b271c5
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Sun Jan 29 11:43:25 2012 +0100

    idoutils:fix syntax error while checking oci runtime

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=6467f17d9a5332c1924fb3ba1eff961408cf1dc2
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Sun Jan 29 11:42:29 2012 +0100

    merge post r1.6 changes

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=fe552917f5c6e102795e6e9242fd004c14de766c
Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Wed Nov 23 21:47:33 2011 +0100

    Core:configure switch --enable-nagiosenv for naming environment variables #2083
    refs #2083

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=8f6b0436053460484605871392b4ab62a3edc50c
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Jan 27 19:54:29 2012 +0100

    adapt -pg example in base/Makefile.in for profiling
    
    refs #2289

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=809e6bb3bda07df3ba084a5dca2f8267213bf09d
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Jan 27 19:35:50 2012 +0100

    * core: avoid insane looping through event list when rescheduling checks (Mathias Kettner, Andreas Ericsson) #2182
    
    please refer to https://dev.icinga.org/issues/2182
    for a detailed analysis of the problem, the used
    algorithms and the revamped logic.
    
    kudos to Mathias and Andreas.
    
    refs #2182

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=c436c6d30986866febf02932eb97229c55e7df34
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Jan 27 16:28:55 2012 +0100

    * core: avoid senseless looping when free()'ing macros (Andreas Ericsson) #2184
    
    previously, the macro free'ing happened within a loop
    elaborating with a switch case statement if the macro
    should be cleaned or not.
    since these calls would have happened either way for
    *all* known macros, we just call my_free on all known
    macros and prevent senseless looping. clearing out
    host/service/hostgroup/servicegroup/contact/contactgroup
    macros can be very expensive on the long run when i.e.
    sending notifications.
    
    refs #2184

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

    core: fix event removal from queues with O(1) removal from doubly linked lists (Andreas Ericsson) #2183
    
    given the fact that the algorithm before was violating the purpose
    of a double linked list, looping over the event list if the on top
    event was not found in the first place, this is now revamped.
    
    since the event itsself provides next and prev pointers already,
    we can work with the "next" and the "previous" events in the list.
    
    if there is a previous event before the current one, we modify its
    next pointer to target the events' next event, leaving out the event
    to remove.
    same goes for the next event, if there, its previous pointer leaves
    out the event to remove, but targetting the event before.
    
    in case there is no previous event, the head of the list is modified
    to point to the next event after the removed one.
    same matches for the tail of the list, assigning the previous and now
    last event of the list.
    
    if there was only one element in the list, the last 2 condition would
    match, setting the head and tail pointers to NULL, meaning to say -
    1 list, removed 1 element, now empty list.
    
    this algorithm allows to remove an event just by reordering next and
    previous pointers within a doubly linked list, and preventing us to loop.
    
    so to say, Andreas is a genius ...
    
    refs #2183

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=78db2dc5c4309d05794c5535a249f3a5b69f1585
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Jan 27 12:53:47 2012 +0100

    * core: notifications: Create contact list after eventbroker callbacks (Andreas Ericsson) #2110
    
    moving the notification contact list creation *after*
    sending the neb callback to event brokers that notification
    was started will allow such modules to take care of their
    own notification logic without having to take care about
    the list now floating in memory.
    
    refs #2110

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=2dbd96b57c34cf02da834208e827162c900314a0
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Jan 27 12:44:24 2012 +0100

    * core: Plug some macro leaks triggered when sending notifications (Andreas Ericsson) #2109
    
    refs #2109

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=419e0f1857f09e206c872b447758fdfe3388a998
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Jan 27 12:30:23 2012 +0100

    install: Fix notification template installation (Todd Zullinger) #2235
    
    refs #2235

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=b625b21a27fab7c7fcc51b7958169ad59bb2b2d0
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Jan 27 12:23:01 2012 +0100

    debug: set debug_verbosity=2 by default #2236
    
    refs #2236

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=a896e45733056cc5ed041b89bcfa7ee569b948f6
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Jan 19 13:15:46 2012 +0100

    upgrade configure in tap/ to >= 2.65
    
    this makes this foo aware of --datarootdir used by package configure

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=6ccc98ee7666c466b60da94a811d80568814f00c
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Jan 16 13:40:53 2012 +0100

    fix unsafe null ptr passed to debug log, segfault on solaris #2271
    
    refs #2271

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=9532a10ec453cb189d3a499a8c9635a6d777eba8
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Dec 2 21:16:24 2011 +0100

    target master as 1.7.0-dev

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=5a443e680b6db30c41d4cdacc8fe3535fd7dd2d6
Merge: abc686f97ed3a1c5a64ae14e93518e3738074da5 e9829a20e769e293d4e3619d96e24adba91b9708
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Dec 2 21:15:31 2011 +0100

    Merge branch 'r1.6'

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=abc686f97ed3a1c5a64ae14e93518e3738074da5
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Dec 2 21:15:11 2011 +0100

    let this be 1.6.1 for now

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=e9829a20e769e293d4e3619d96e24adba91b9708
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Dec 2 16:33:08 2011 +0100

    keep the changelog intact in icinga.spec, re-add 1.5.1

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=09a50bac49cdaae7758e932c61285c83be4530b1
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Dec 2 14:53:23 2011 +0100

    add icinga.spec changelog entry to 1.6.1 bump

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=dad902969980a722011a6c81150b06ade528ef25
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Fri Dec 2 14:44:46 2011 +0100

    update changelog and set version to 1.6.1 quickfix

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=2208b714cc3a3e9257d474fd444000c6cc3c82f1
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Dec 1 21:02:26 2011 +0100

    remove wrong expiration calculation on freshness checks #2136
    
    this is a revert, and needs a proper fix, but will do for now.
    
    refs #2136

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=5c32373a777a869d2dc28c30dab4e229ab83974e
Merge: 1d4901a2e3ef464deedc1f90ce74143ad96b4447 bd8788c5c6648b62020853449fb59427d8f8f84c
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 28 11:06:58 2011 +0100

    Merge branch 'r1.6'

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=1d4901a2e3ef464deedc1f90ce74143ad96b4447
Merge: 138729c6ef7d25fadb8212af2065a449314d4d13 9709d9430590f21f66c9814e24bffcec952354b1
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Nov 27 13:22:29 2011 +0100

    Merge branch 'r1.6'

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=138729c6ef7d25fadb8212af2065a449314d4d13
Merge: b55ab2ec9ef4788d8211a13e6e80ac223346cc02 fc119a30e1d88085f52d1e204361d87ea3a54227
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Nov 23 15:02:47 2011 +0100

    Merge branch 'r1.6'

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=b55ab2ec9ef4788d8211a13e6e80ac223346cc02
Merge: 95df3a07a7d95e2ebc356f96f2cf301cdeab7e5d 515b20048c2bffe330fd42393700eac9ed9d30be
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Nov 16 18:58:19 2011 +0100

    Merge branch 'r1.6'

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=95df3a07a7d95e2ebc356f96f2cf301cdeab7e5d
Merge: 098a50f2cd019e71f1ad7835995799328c1d2ccd de3e6ea95314ec9b2a6c0df6afbc4f61a4079358
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Nov 16 16:32:32 2011 +0100

    Merge branch 'test/ido'

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=098a50f2cd019e71f1ad7835995799328c1d2ccd
Merge: e60aa1a5d90e7c4e81f348e8b596927985a4f34e 7916d4152e010799928f82777ce2358e91fa70b1
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Nov 16 15:46:07 2011 +0100

    Merge branch 'r1.6'

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=e60aa1a5d90e7c4e81f348e8b596927985a4f34e
Merge: 86c6aa380e976b6d41c04fea4c3dd31563048572 de5c34ea5638ed77ee5f4ea65fd47868dbf790e9
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Nov 15 18:57:04 2011 +0100

    Merge branch 'r1.6'

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=86c6aa380e976b6d41c04fea4c3dd31563048572
Merge: f847c6ce5b4592893a91b25a9ad0905a9ed77881 6b25948c31a1894b231ee6db00675d09d697757d
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Nov 15 18:42:48 2011 +0100

    Merge branch 'r1.6'

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=f847c6ce5b4592893a91b25a9ad0905a9ed77881
Merge: f039eb5706b92987338cc22e02744f1734776e9f c53882ad405f902e7ddda439915a75191f2cc340
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Nov 15 18:40:42 2011 +0100

    Merge branch 'r1.6'

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=f039eb5706b92987338cc22e02744f1734776e9f
Merge: b9c648a624000e30e22e140636206a0b774514ce 99432c7a9b325baa1cacc47a9fd6d036061abe9a
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Nov 15 18:37:52 2011 +0100

    Merge branch 'r1.6'
    
    Conflicts:
    	docbook

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

    Merge branch 'test/core'

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

    flag master as 1.6.0-dev again

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

    Merge branch 'test/core'

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

    Merge branch 'test/core'

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=10a6aef5d9a2ece3ef98b4a30649b16fc7bcfede
Merge: 22e884431943bb3dc88f75962b4a4f928a4d71c1 7ae6a89e7860f619dc1282ca6e2fef6a136bef74
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 14 09:26:21 2011 +0100

    Merge branch 'test/core'

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=22e884431943bb3dc88f75962b4a4f928a4d71c1
Merge: abc93941101f32328440dd31dd43d1352298fd1c c2bbe9e3f85f83ad2cdfbcc3bc2fa85854d461f2
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 14 09:26:21 2011 +0100

    Merge branch 'test/cgis'

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

    Merge branch 'test/ido'

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=2e9c0f43975c1d57a01c55f79c54c7aa1758921d
Merge: 1f08d038bedcb0d8d256e5c5e3fb7ff2f202726f 6697aa0b70345d68c262bf3e4be7ae14b7e4f9ea
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Nov 9 16:44:34 2011 +0100

    Merge branch 'test/core'
    
    Conflicts:
    	Changelog

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

    Merge branch 'test/cgis'

URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=cd818f6c4dec96dc66b20462022f2a2273386445
Merge: c1613965f20b8227e5795a96570f318fc03773fe 3b5fc3b97e7a32d06dddc134897d83e2ce541cfe
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Oct 31 13:49:18 2011 +0100

    Merge branch 'test/ido'





More information about the icinga-checkins mailing list