clean up rebase

Author: nchmura4

pandas/tseries/resample.py

@@ -888,7 +888,7 @@ def _upsample(self, method, limit=None, fill_value=None):
         # we may need to actually resample as if we are timestamps
         if self.kind == 'timestamp':
             return super(PeriodIndexResampler, self)._upsample(method,
-                                                               limit=limit)
+                limit=limit, fill_value=fill_value)
 
         ax = self.ax
         obj = self.obj