public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9188f6142c7681ad46cf9acbfc42c2780f951f6c
Date: Wed, 06 Aug 2014 10:31:03 +0200	[thread overview]
Message-ID: <20140806083103.CAEF1215CD@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2156 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  9188f6142c7681ad46cf9acbfc42c2780f951f6c (commit)
       via  5ffd14f1407ca9be93a2edd65d7151567927fbb4 (commit)
       via  38ace2f3aedf619f6b5b54979ba2823bb77af73e (commit)
       via  ce12ce8cd7ebb3e190b84b9fc79c3d626f0c83d6 (commit)
      from  a0a3d81c123cece4c25227c71c983a45594715e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9188f6142c7681ad46cf9acbfc42c2780f951f6c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 6 10:30:44 2014 +0200

    check_mk_agent: Bump release version to 4.

commit 5ffd14f1407ca9be93a2edd65d7151567927fbb4
Merge: a0a3d81 38ace2f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 6 10:28:57 2014 +0200

    Merge remote-tracking branch 'morlix/check_mk'

-----------------------------------------------------------------------

Summary of changes:
 config/backup/includes/check_mk_agent | 1 +
 lfs/check_mk_agent                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 config/backup/includes/check_mk_agent

Difference in files:
diff --git a/config/backup/includes/check_mk_agent b/config/backup/includes/check_mk_agent
new file mode 100644
index 0000000..ca71046
--- /dev/null
+++ b/config/backup/includes/check_mk_agent
@@ -0,0 +1 @@
+/etc/check_mk/
diff --git a/lfs/check_mk_agent b/lfs/check_mk_agent
index 541d7d6..5326471 100644
--- a/lfs/check_mk_agent
+++ b/lfs/check_mk_agent
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/check_mk-${VER}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = check_mk_agent
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = ""
 


hooks/post-receive
--
IPFire 2.x development tree

                 reply	other threads:[~2014-08-06  8:31 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140806083103.CAEF1215CD@argus.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox