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

mibs/ATM-FORUM-ADDR-REG

Executable → Regular

mibs/CABLETRON-TRAPS

Executable → Regular

mibs/CABLETRON-TRAPS-IRM

Executable → Regular

mibs/CISCOSB-1-BONJOUR-SERVICE-MIB

Executable → Regular

mibs/CISCOSB-3SW2SWTABLES-MIB

Executable → Regular

mibs/CISCOSB-AAA

Executable → Regular

mibs/CISCOSB-BANNER-MIB

Executable → Regular

mibs/CISCOSB-BONJOUR-MIB

Executable → Regular

mibs/CISCOSB-BRGMACSWITCH-MIB

Executable → Regular

mibs/CISCOSB-BRIDGE-SECURITY

Executable → Regular

mibs/CISCOSB-BRIDGEMIBOBJECTS-MIB

Executable → Regular

mibs/CISCOSB-BaudRate-MIB

Executable → Regular

mibs/CISCOSB-CDB-MIB

Executable → Regular

mibs/CISCOSB-CDP-MIB

Executable → Regular

mibs/CISCOSB-CLI-MIB

Executable → Regular

mibs/CISCOSB-COPY-MIB

Executable → Regular

mibs/CISCOSB-CPU-COUNTERS-MIB

Executable → Regular

mibs/CISCOSB-DEBUGCAPABILITIES-MIB

Executable → Regular

mibs/CISCOSB-DEVICEPARAMS-MIB

Executable → Regular

mibs/CISCOSB-DHCP-MIB

Executable → Regular

mibs/CISCOSB-DHCPCL-MIB

Executable → Regular

mibs/CISCOSB-DNSCL-MIB

Executable → Regular

mibs/CISCOSB-DOT1X-MIB

Executable → Regular

mibs/CISCOSB-Dlf-MIB

Executable → Regular

mibs/CISCOSB-EEE-MIB

Executable → Regular

mibs/CISCOSB-EMBWEB-MIB

Executable → Regular

mibs/CISCOSB-ENDOFMIB-MIB

Executable → Regular

mibs/CISCOSB-ERRDISABLE-RECOVERY-MIB

Executable → Regular

mibs/CISCOSB-EVENTS-MIB

Executable → Regular

mibs/CISCOSB-File

Executable → Regular

mibs/CISCOSB-GREEN-MIB

Executable → Regular

mibs/CISCOSB-GVRP-MIB

Executable → Regular

mibs/CISCOSB-HWENVIROMENT

Executable → Regular

mibs/CISCOSB-IP

Executable → Regular

mibs/CISCOSB-IPv6

Executable → Regular

mibs/CISCOSB-IpRouter

Executable → Regular

mibs/CISCOSB-JUMBOFRAMES-MIB

Executable → Regular

mibs/CISCOSB-LBD-MIB

Executable → Regular

mibs/CISCOSB-LLDP-MIB

Executable → Regular

mibs/CISCOSB-LOCALIZATION-MIB

Executable → Regular

mibs/CISCOSB-MAC-BASE-PRIO

Executable → Regular

mibs/CISCOSB-MIB

Executable → Regular

mibs/CISCOSB-MIR-MIB

Executable → Regular

mibs/CISCOSB-MNGINF-MIB

Executable → Regular

mibs/CISCOSB-MULTISESSIONTERMINAL-MIB

Executable → Regular

mibs/CISCOSB-PHY-MIB

Executable → Regular

mibs/CISCOSB-POE-MIB

Executable → Regular

mibs/CISCOSB-POLICY-MIB

Executable → Regular

mibs/CISCOSB-Physicaldescription-MIB

Executable → Regular

mibs/CISCOSB-ProtectedPorts-MIB

Executable → Regular

mibs/CISCOSB-QOS-CLI-MIB

Executable → Regular

mibs/CISCOSB-RMON

Executable → Regular

mibs/CISCOSB-SCT-MIB

Executable → Regular

mibs/CISCOSB-SECURITY-SUITE

Executable → Regular

mibs/CISCOSB-SENSORENTMIB

Executable → Regular

mibs/CISCOSB-SMARTPORTS-MIB

Executable → Regular

mibs/CISCOSB-SMON-MIB

Executable → Regular

mibs/CISCOSB-SNMP-MIB

Executable → Regular

mibs/CISCOSB-SOCKET-MIB

Executable → Regular

mibs/CISCOSB-SSH-MIB

Executable → Regular

mibs/CISCOSB-SSL

Executable → Regular

mibs/CISCOSB-STACK-MIB

Executable → Regular

mibs/CISCOSB-STORMCTRL-MIB

Executable → Regular

mibs/CISCOSB-SYSLOG-MIB

Executable → Regular

mibs/CISCOSB-SYSMNG-MIB

Executable → Regular

mibs/CISCOSB-SpecialBpdu-MIB

Executable → Regular

mibs/CISCOSB-TBI-MIB

Executable → Regular

mibs/CISCOSB-TCPSESSIONS

Executable → Regular

mibs/CISCOSB-TELNET-MIB

Executable → Regular

mibs/CISCOSB-TIMESYNCHRONIZATION-MIB

Executable → Regular

mibs/CISCOSB-TRACEROUTE-MIB

Executable → Regular

mibs/CISCOSB-TRAPS-MIB

Executable → Regular

mibs/CISCOSB-TRUNK-MIB

Executable → Regular

mibs/CISCOSB-TUNNEL-MIB

Executable → Regular

mibs/CISCOSB-Tuning

Executable → Regular

mibs/CISCOSB-UDP

Executable → Regular

mibs/CISCOSB-WeightedRandomTailDrop-MIB

Executable → Regular

mibs/CISCOSB-rlBrgMcMngr-MIB

Executable → Regular

mibs/CISCOSB-rlBrgMulticast-MIB

Executable → Regular

mibs/CISCOSB-rlFft

Executable → Regular

mibs/CISCOSB-rlInterfaces

Executable → Regular

mibs/CISCOSB-rlLcli-MIB

Executable → Regular

mibs/CISCOSB-rndApplications

Executable → Regular

mibs/CISCOSB-rndMng

Executable → Regular

mibs/CISCOSB-vlan-MIB

Executable → Regular

mibs/CISCOSB-vlanVoice-MIB

Executable → Regular

mibs/DIFF-SERV-MIB

Executable → Regular

mibs/DRAFT-IETF-SYSLOG-DEVICE-MIB

Executable → Regular

mibs/F10-C-SERIES-CHASSIS-MIB

Executable → Regular

mibs/IRM-OIDS

Executable → Regular

mibs/LLDP-EXT-DCBX-MIB

Executable → Regular

mibs/LLDP-EXT-DOT3-MIB

Executable → Regular

mibs/LLDP-EXT-MED-MIB

Executable → Regular

mibs/NETWORK-DIAGS

Executable → Regular

mibs/Nikola-MIB

Executable → Regular

mibs/PowerNet-MIB

+71434 -71434

File diff suppressed because it is too large Load Diff

mibs/RBTWS-AP-TC

Executable → Regular

mibs/RBTWS-CLIENT-SESSION-TC

Executable → Regular

mibs/REPEATER-MIB-2

Executable → Regular

mibs/ROUTER-OIDS

Executable → Regular

Some files were not shown because too many files have changed in this diff Show More