Merge release 1.6.1

James Moger

2014-10-20 9984ea8f5d9fad31a5e68935756ca8eb406d6b2c

 src/test/java/com/gitblit/tests/TimeUtilsTest.java

@@ -100,9 +100,9 @@


   @Test

   public void testFrequency() {

      assertEquals(5, TimeUtils.convertFrequencyToMinutes("2 mins"));

      assertEquals(10, TimeUtils.convertFrequencyToMinutes("10 mins"));

      assertEquals(600, TimeUtils.convertFrequencyToMinutes("10 hours"));

      assertEquals(14400, TimeUtils.convertFrequencyToMinutes(" 10 days "));

      assertEquals(5, TimeUtils.convertFrequencyToMinutes("2 mins", 5));

      assertEquals(10, TimeUtils.convertFrequencyToMinutes("10 mins", 5));

      assertEquals(600, TimeUtils.convertFrequencyToMinutes("10 hours", 5));

      assertEquals(14400, TimeUtils.convertFrequencyToMinutes(" 10 days ", 5));

   }

}