Merge branch 'ticket/140' into develop

James Moger

2014-09-04 9f4544301f8ce4016f8dd948d8bc9a754ff3e5da

 src/main/java/com/gitblit/transport/ssh/FileKeyManager.java

@@ -29,6 +29,7 @@
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.io.Files;
import com.google.inject.Inject;

/**
 * Manages public keys on the filesystem.
@@ -42,6 +43,7 @@

   protected final Map<File, Long> lastModifieds;

   @Inject
   public FileKeyManager(IRuntimeManager runtimeManager) {
      this.runtimeManager = runtimeManager;
      this.lastModifieds = new ConcurrentHashMap<File, Long>();