Merge branch 'master' of github.com:laf/librenms into issue-798

Browse Source

Conflicts:
	includes/polling/functions.inc.php

...

This commit is contained in:

laf

2015-05-04 09:16:48 +01:00

parent 965b0df8cb a7764dd27c

commit 0bf3b518f5

2092 changed files with 222801 additions and 74702 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

html/images/os/adva.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

html/images/os/alcatellucent.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

html/images/os/centos.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 1.8 KiB

html/images/os/debian.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.2 KiB After Width:  |  Height:  |  Size: 4.2 KiB

html/images/os/dragonfly.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.2 KiB After Width:  |  Height:  |  Size: 5.2 KiB

html/images/os/draytek.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1.2 KiB

html/images/os/fedora.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 3.8 KiB

html/images/os/freebsd.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.6 KiB After Width:  |  Height:  |  Size: 2.6 KiB

html/images/os/generic.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

html/images/os/hp.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

html/images/os/linux.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.5 KiB After Width:  |  Height:  |  Size: 4.5 KiB

html/images/os/mandrake.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.7 KiB After Width:  |  Height:  |  Size: 4.7 KiB

html/images/os/monowall.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 435 B After Width:  |  Height:  |  Size: 435 B

html/images/os/netbsd.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

html/images/os/openbsd.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.2 KiB After Width:  |  Height:  |  Size: 5.2 KiB

html/images/os/opensolaris.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 1.8 KiB

html/images/os/pfsense.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1.2 KiB

html/images/os/procera.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 519 B

html/images/os/proxim.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

html/images/os/redhat.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.7 KiB After Width:  |  Height:  |  Size: 4.7 KiB

html/images/os/slackware.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.9 KiB After Width:  |  Height:  |  Size: 4.9 KiB

html/images/os/snom.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.5 KiB

html/images/os/solaris.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

html/images/os/suse.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.7 KiB After Width:  |  Height:  |  Size: 4.7 KiB

html/images/os/ubuntu.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.5 KiB After Width:  |  Height:  |  Size: 4.5 KiB

html/images/os/voswall.png

Executable → Regular

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 1.8 KiB