diff options
| author | Simon Rettberg | 2015-02-26 17:07:00 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2015-02-26 17:07:00 +0100 |
| commit | 59f17e9a1d1f6b1ef45a52cb59fa625551d3e357 (patch) | |
| tree | 93d3eaf6c7919c295b08a748cdc5f8b3f00a4a8f /src/main | |
| parent | Remove some debug messages, fix possible race condition in ImageProcessor (diff) | |
| download | masterserver-59f17e9.tar.gz masterserver-59f17e9.tar.xz masterserver-59f17e9.zip | |
Stuff
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/db/DbSatellite.java | 1 | ||||
| -rw-r--r-- | src/main/properties/log4j.properties | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/DbSatellite.java b/src/main/java/org/openslx/imagemaster/db/DbSatellite.java index 4f2576e..4f5a0c8 100644 --- a/src/main/java/org/openslx/imagemaster/db/DbSatellite.java +++ b/src/main/java/org/openslx/imagemaster/db/DbSatellite.java @@ -29,6 +29,7 @@ public class DbSatellite this.address = address; this.name = name; this.publickeyString = publickeyString; + this.authMethod = authMethod; } public static DbSatellite fromOrganizationId( String organizationId ) diff --git a/src/main/properties/log4j.properties b/src/main/properties/log4j.properties index 5452d52..881887e 100644 --- a/src/main/properties/log4j.properties +++ b/src/main/properties/log4j.properties @@ -8,7 +8,4 @@ log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %F - %m%n log4j.logger.org.apache.directory=ERROR log4j.logger.org.apache.mina=ERROR -log4j.logger.org.apache.ftpserver=ERROR -log4j.logger.org.openslx.filetransfer=ERROR - -org.apache.thrift.server.AbstractNonblockingServer=ERROR
\ No newline at end of file +log4j.logger.org.apache.thrift.server.AbstractNonblockingServer=ERROR |