azkaban-uncached

<< < 188 189 190 191 192 > >>

more merge fixes

10/14/2013 7:45:41 PM

cjyu

Commit: d62cf58

Parents: edda4b7

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

10/14/2013 7:41:54 PM

cjyu

Commit: edda4b7

Parents: 7443a95
bb34b0f

Merge pull request #53 from davidzchen/master Minor changes

10/12/2013 2:54:33 PM

Chenjie Yu

Commit: bb34b0f

Parents: 8a27213
39f6b41

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

10/12/2013 12:57:02 PM

David Z. Chen

Commit: 39f6b41

Parents: 356e12a

Add .gitignore.

10/12/2013 12:53:13 PM

David Z. Chen

Commit: 356e12a

Parents: 8a27213

Merge pull request #45 from davidzchen/add_comments Add …

10/8/2013 4:02:05 PM

comment headers to all source files.

Chenjie Yu

Commit: 8a27213

Parents: df6eb48
98ddae1

Merge changes from master. Add header comments to new files.

10/8/2013 4:00:25 PM

David Z. Chen

Commit: 98ddae1

Parents: 29bccd4
df6eb48

Add comment headers to JS views.

9/18/2013 6:20:59 AM

David Z. Chen

Commit: 29bccd4

Parents: 68d1b18

Add comment headers to all source files.

9/17/2013 10:11:45 PM

David Z. Chen

Commit: 68d1b18

Parents: dd09cf8

merge with all other changes

10/14/2013 7:30:24 PM

cjyu

Commit: 7443a95

Parents: 1f37db1