Merge branch 'ticket/161' into develop

James Moger

2014-09-08 14181da41a98817aef2b528f92d58613e61e495f

 src/main/java/com/gitblit/servlet/FederationServlet.java

@@ -170,7 +170,7 @@


         // setup the last and netx pull dates

         results.lastPull = new Date();

         int mins = TimeUtils.convertFrequencyToMinutes(results.frequency);

         int mins = TimeUtils.convertFrequencyToMinutes(results.frequency, 5);

         results.nextPull = new Date(System.currentTimeMillis() + (mins * 60 * 1000L));



         // acknowledge the receipt of status