The Golden State Warriors have agreed to re-sign JaVale McGee on a one-year deal.

McGee's deal will be for the veteran's minimum and puts the Warriors' roster at 15 guaranteed contracts.

The Warriors invited McGee to training camp last summer, and he made the 15-man roster.

McGee bounced around the NBA over the past few years before reestablishing himself as a productive rotation big.