Merge pull request #125 from atc-/0.96.1

0.96.1
atcol · Jan 4, 2015 · 4885c54 · 4885c54
2 parents a908ec9 + bcb2337
commit 4885c54
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/grails-app/conf/DataSource.groovy b/grails-app/conf/DataSource.groovy
@@ -18,19 +18,19 @@ environments {
     development {
         dataSource {
             dbCreate = "create-drop" // one of 'create', 'create-drop', 'update', 'validate', ''
-            url = "jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE"
+            url = "jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE;FILE_LOCK=SOCKET"
         }
     }
     test {
         dataSource {
             dbCreate = "update"
-            url = "jdbc:h2:file:/var/lib/h2/testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE"
+            url = "jdbc:h2:file:/var/lib/h2/testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE;FILE_LOCK=SOCKET"
         }
     }
     production {
         dataSource {
             dbCreate = "update"
-            url = "jdbc:h2:file:/var/lib/h2/prodDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE"
+            url = "jdbc:h2:file:/var/lib/h2/prodDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE;FILE_LOCK=SOCKET"
             properties {
                // See http://grails.org/doc/latest/guide/conf.html#dataSource for documentation
                jmxEnabled = true

diff --git a/src/groovy/docker/registry/web/support/Image.groovy b/src/groovy/docker/registry/web/support/Image.groovy
@@ -1,6 +1,7 @@
 package docker.registry.web.support
 
 class Image {
+    String checksum
     String displayName
     String pullName
     String architecture
@@ -22,7 +23,8 @@ class Image {
     @Override
     public String toString() {
         return "Image{" +
-                "displayName='" + displayName + '\'' +
+                "checksum='" + checksum + '\'' +
+                ", displayName='" + displayName + '\'' +
                 ", pullName='" + pullName + '\'' +
                 ", architecture='" + architecture + '\'' +
                 ", author='" + author + '\'' +