todb-r7

diff --git a/README.rdoc b/README.rdoc
index 7eabde9..3941f79 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -112,8 +112,8 @@ Issues and bug reports can also be tracked here:
 === Rake References
 
 * Rake Documentation Home: http://docs.rubyrake.org
-* Rake Project Page: http://rubyforge.org/projects/rake
-* Rake API Documents: http://rake.rubyforge.org

todb-r7

-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: SKS 1.1.4
Comment: Hostname: pgp.mit.edu

mQINBFRb3ZcBEADUru6i1+uqptYb03/dECS0yL5i3dKhKjmdpBUFAnzl2ztPltTFyC3oUEna
vFshtz6rxwKeBYiDEBhJI5wC6GtjnPDLLwDDb1zQYidhOBv9U0gHYJT9qhIyVo6k9M925MAa
K7J2XjG7qR9RTIyw74i9trFVGr/m4+W6J5o2C1V/IZmwduZSMBrwpJKBdK74sIZI2RgIKS9z
zZb92ggZykyOXADESG1TgNmZ+evhKT7eCujYSW/gysgODHQwJhBGOdbod5MiLmsb5fjWD1AB
XJgh/UJYzAB1dIlfqd3cH63ub3oKOfM2cjl6Exmcr2W12C3Z1/A+ZeircnPeJfZuQ/eq97Wx
SAu9AB6rG8lHQGgMWZAKvnZXfELYnGjzy+qDoedzUK6v7jl5dpi5B43lHk0ENA3AT3i3bGaF

todb-r7

Hi all --

Sorry for the short notice, but I was just given short notice from Alfredo that we have a conflict with some football strokefest that's happening at Tramps tonight. We won't be able to get the room. The proposed reschedule time is Friday night (tomorrow, September 27, 2013).

This kinda sucks, obviously.

I will get with Alfredo and ensure that our calendar is clear for the rest of the season, however long that is. That said, we may want to start looking for new digs, due to:

• The new parking situation
• The steady decrease of resolution with the A/V

todb-r7

NC = No conflict (files touched are all new or don't involve retabbed files)

PR = Pull Request generated

2329 NC
2328 PR
2327 NC
2326 NC
2325 PR
2321 NC

todb-r7

#!/usr/bin/env ruby

require 'packetfu'

# You'll need to have a recent version of rex. Here's where mine lives
$:.unshift('/home/todb/git/rapid7/metasploit-framework/lib')
require 'rex'

class Xform
  attr_accessor :orig, :packets, :bytes

todb-r7

[push]
	# 'git push' should only hit this branch, not all.
	default = current
[alias]
	publish = push upstream upstream-master:master
	# Usage: $1 is HISNAME, $2 is HISBRANCH
	pr-url =!"xdg-open https://github.com/todb-r7/metasploit-framework/pull/new/$1:$2...$(git branch-current) #"
	

todb-r7

I'm Tod Beardsley, aka todbatx on Reddit, for real. You can check my commit history here and here, and I'm the Engineering Manager for the Metasploit Framework, at least according to LinkedIn and my resume. I'm doing an AmA with Thomas d'Otreppe on Thursday, July 11.

todb-r7

##
# This file is part of the Metasploit Framework and may be subject to
# redistribution and commercial restrictions. Please see the Metasploit
# web site for more information on licensing and terms of use.
#   http://metasploit.com/
##

require 'msf/core'

class Metasploit3 < Msf::Exploit::Remote

todb-r7

Benjamin Cavileer (1):
      Fix joining with the threads

James Lee (1):
      Move specs to spec/ and add a Rakefile

Tod Beardsley (20):
      Adds a functional test for LLDP
      Rename the test script
      Comment docs

todb-r7

[alias]
branch-current = rev-parse --abbrev-ref HEAD
# Usage:   git-pr HISNAME HISBRANCH
# Example: git-pr rapid7 master
# Example: git-pr JoeContributor bug/his-fix-for-a-bug-that-you-fixed
pr-url =!"xdg-open https://github.com/todb-r7/metasploit-framework/pull/new/$1:$2...$(git branch-current) #"