MINNEAPOLIS -- Nick Punto will be activated from the disabled list and rejoin the Twins in San Diego, where they begin a three-game series on Tuesday. To make room for him, the team has optioned infielder Matt Macri to Triple-A Rochester.

Punto's rehab assignment at Class A Fort Myers went well, and manager Ron Gardenhire feels as though he is completely healed from an injury that has hampered him this year.

Punto first injured his left hamstring in early May. He spent three weeks on the DL before returning to the Twins on May 31. But Punto immediately re-injured the hamstring while playing against the Yankees in his first game back on the FieldTurf of the Metrodome, and he was placed on the disabled list again.

What role Punto returns to is currently unclear. Brendan Harris has been playing shortstop while youngsters Alexi Casilla and Brian Buscher have solidified second and third base, respectively.

"Harris is doing fine, he's doing fine at shortstop," Gardenhire said. "Nicky's more agile up the middle, but we're going on OK. We'll just mix them all in. This gives me another option. If Nicky takes over at shortstop, it's because he deserves to take over. And I'll move everybody around. ... I'm not benching anybody. When Nicky gets here, we'll see how we're going to use him. Left-handers, right-hander, doesn't matter, we're going to try to put our best lineup out there."

Macri said he is healthy after leaving Friday's game against Arizona with a strained left calf. It was an aggravation of an injury he suffered earlier this year while with Rochester. Macri's MRI revealed the old strain, along with small amounts of fluid around the calf.

Macri had teamed with Buscher to provide an effective platoon at third base prior to being sent down. Macri batted .367 (11-for-30) with a home run and four RBIs for the Twins.