Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
  • Loading branch information
John C. Frickson committed Jul 12, 2016
2 parents 220e194 + 2d8ee08 commit 38d2ca7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions include/common.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* COMMON.H - NRPE Common Include File
* Copyright (c) 1999-2007 Ethan Galstad ([email protected])
* Last Modified: 06-07-2016
* Last Modified: 07-12-2016
*
* License:
*
Expand All @@ -27,8 +27,8 @@
#include <@SSL_INC_PREFIX@@SSL_HDR@>
#endif

#define PROGRAM_VERSION "nrpe-3.0-PRE2"
#define MODIFICATION_DATE "06-07-2016"
#define PROGRAM_VERSION "nrpe-3.0"
#define MODIFICATION_DATE "07-12-2016"

#define OK 0
#define ERROR -1
Expand Down
6 changes: 3 additions & 3 deletions update-version
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ then
fi

# Update version number and release date in common code
perl -i -p -e "s/VERSION \".*\"/VERSION \"$1\"/;" include/common.h
perl -i -p -e "s/MODIFICATION_DATE \".*\"/MODIFICATION_DATE \"$SHORTDATE\"/;" include/common.h
perl -i -p -e "s/Last Modified: [0-9].*/Last Modified: $SHORTDATE/;" include/common.h
perl -i -p -e "s/VERSION \".*\"/VERSION \"$1\"/;" include/common.h.in
perl -i -p -e "s/MODIFICATION_DATE \".*\"/MODIFICATION_DATE \"$SHORTDATE\"/;" include/common.h.in
perl -i -p -e "s/Last Modified: [0-9].*/Last Modified: $SHORTDATE/;" include/common.h.in

# Update version number and release date in main code
perl -i -p -e "s/Last Modified: [0-9].*/Last Modified: $SHORTDATE/;" src/nrpe.c
Expand Down

0 comments on commit 38d2ca7

Please sign in to comment.