azkaban-uncached

Fix update script for migrating from 2.0 to 2.1 * execution_logs …

has no primary key in 2.0
* Missing ";" breaks update scripts

Ignore jetty.ssl.port property when jetty.use.ssl=false; …

add version property to database.properties to prevent start-up error

Make description a non-required field for reports

add hadoop resource to solo server start script

bug fixes add metrics user for metrics permissions only for …

operations monitoring

more merge fixes

Merge remote branch 'origin/master' Conflicts: src/java/azkaban/executor/ExecutorMailer.java src/java/azkaban/executor/RemoteExecutorConnector.java src/java/azkaban/scheduler/JdbcScheduleLoader.java src/java/azkaban/scheduler/Schedule.java src/java/azkaban/scheduler/ScheduleLoader.java src/java/azkaban/sla/JdbcSLALoader.java src/java/azkaban/sla/SLA.java src/java/azkaban/sla/SLALoader.java src/java/azkaban/sla/SLAManager.java src/java/azkaban/sla/SLAManagerException.java src/java/azkaban/sla/SlaMailer.java src/java/azkaban/utils/Utils.java src/java/azkaban/webapp/AzkabanServer.java

Merge pull request #53 from davidzchen/master Minor changes

Add jetty.ssl.port to soloserver azkaban.properties file.

Add .gitignore.