Skip to content

Commit

Permalink
Update ChangeLog to record accepted merge by Rchard Moore.
Browse files Browse the repository at this point in the history
Minor change to .travis.yml.
  • Loading branch information
royhills committed May 23, 2015
1 parent 58c45a3 commit 4cc8134
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
- BUILD_ARGS="--with-openssl"
# Build with gcov code coverage
- BUILD_ARGS="--enable-gcov"
# gcov code coverage only works with gcc, so don't use it with clang.
# gcov code coverage only works with gcc, so don't run it with clang.
matrix:
exclude:
- compiler: clang
Expand All @@ -20,4 +20,5 @@ before_install:
- sudo pip install cpp-coveralls --use-mirrors
script:
- autoreconf --install && ./configure $BUILD_ARGS && make && make check
after_success: if [ $BUILD_ARGS == "--enable-gcov" ]; then coveralls --exclude lib --exclude tests; fi
after_success:
- if [ $BUILD_ARGS == "--enable-gcov" ]; then coveralls ; fi
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2014-05-23 Richard Moore <rich@...>

* ika-scan.c, ike-scan.c: Added option to bind to a specific interface.

2014-03-21 Roy Hills <Roy.Hills@nta-monitor.com>

* isakmp.c: Added fclose call to fix the potential file pointer
Expand Down

0 comments on commit 4cc8134

Please sign in to comment.