Merge branch 'ticket/177' into develop

James Moger

2014-09-11 5399d90cefd707e9bf3f9ef7e1f9e6b40d68a955

 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