Everyone knew Mariano Rivera was going to re-sign with the Yankees. It was just a matter of when.

It looks like the waiting is over, however, as the New York Daily News reports Rivera will sign a two-year, $30 million deal that will keep the future Hall of Fame closer in pinstripes through 2012.

Rivera is coming off yet another strong season, in which he saved 33 games while posting a 1.80 ERA and 0.83 WHIP. The 41-year-old earned $15 million in 2010, so he is not getting a raise.

It was believed that a deal with Rivera wouldn't get done until New York locked up his Derek Jeter. But with the negotiations with the shortstop moving slowly, the Yankees decided to pounce on their closer; which was a no-brainer, anyway.