~vcs-imports/nut:pull_404_rebased

Last commit made on 2017-03-17
Get this branch:
git clone -b pull_404_rebased https://git.launchpad.net/~vcs-imports/nut

Branch merges

Branch information

Name:
pull_404_rebased
Repository:
lp:~vcs-imports/nut

Recent commits

2c97d72... by Spiros Ioannou <email address hidden>

phoenixcontact_modbus driver

Closes: https://github.com/networkupstools/nut/pull/404

1f3f302... by Spiros Ioannou <email address hidden>

added libmodbus-dev to travis configuration

87930a0... by Arnaud Quette

Prefer @CONFPATH@ over @sysconfdir@

Otherwise, the generated nutshutdown script can end up with a non fully
expanded path like "${prefix}/etc/nut.conf" when not specifying --sysconfdir
and using default flags

Signed-off-by: Arnaud Quette <email address hidden>

6fd4129... by Arnaud Quette

Merge branch 'bigon-bug-382'

Closes: https://github.com/networkupstools/nut/pull/384

6c6b5da... by Arnaud Quette

Merge branch 'bug-382' of https://github.com/bigon/nut into bigon-bug-382

ad23726... by Arnaud Quette <email address hidden>

Merge pull request #400 from jimklimov/snmp-ups-bypass

snmp-ups.c : presumed typo fix : NUT var for bypass mapping is …

22e812e... by Jim Klimov

Merge pull request #375 from jimklimov/upsrdvctl-nowait

Add 'nowait' option for upsdrvctl in ups.conf

c638168... by Jim Klimov <email address hidden>

Merge remote-tracking branch 'upstream/master' into upsrdvctl-nowait

7d77f49... by Jim Klimov <email address hidden>

spellcheck: "futher" is a mistaken exception in custom dictionary

2961dd1... by Jim Klimov <email address hidden>

nut.dict bumped to support nut-website documents with words that Travis does not know