Skip to content

Commit b1c5a6a

Browse files
d80tb7d80tb7
committed
merge master
2 parents f8c72a0 + bf59ae7 commit b1c5a6a

File tree

83 files changed

+4916
-1783
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+4916
-1783
lines changed

‎.run/Armada.run.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
<toRun name="Event Ingester" type="GoApplicationRunConfiguration" />
44
<toRun name="Executor" type="GoApplicationRunConfiguration" />
55
<toRun name="Lookout Ingester" type="GoApplicationRunConfiguration" />
6-
<toRun name="Lookout" type="GoApplicationRunConfiguration" />
76
<toRun name="Scheduler" type="GoApplicationRunConfiguration" />
87
<toRun name="Scheduler Ingester" type="GoApplicationRunConfiguration" />
98
<toRun name="Server" type="GoApplicationRunConfiguration" />
9+
<toRun name="lookoutPostgresMigration" type="GoApplicationRunConfiguration" />
10+
<toRun name="schedulerPostgresMigration" type="GoApplicationRunConfiguration" />
1011
<method v="2" />
1112
</configuration>
12-
</component>
13+
</component>

client/scala/scala-armada-client/.gitignore renamed to client/scala/armada-scala-client/.gitignore

File renamed without changes.

client/scala/scala-armada-client/.sbtopts renamed to client/scala/armada-scala-client/.sbtopts

File renamed without changes.

client/scala/scala-armada-client/.scalafmt.conf renamed to client/scala/armada-scala-client/.scalafmt.conf

File renamed without changes.

client/scala/scala-armada-client/README.md renamed to client/scala/armada-scala-client/README.md

File renamed without changes.

client/scala/scala-armada-client/build.sbt renamed to client/scala/armada-scala-client/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ lazy val root = project
44
.in(file("."))
55
.settings(
66
organization := "io.armadaproject.armada",
7-
name := "Scala-Armada-Client",
7+
name := "Armada Scala Client",
88
version := "0.1.0-SNAPSHOT",
99

1010
scalaVersion := scala2Version,

client/scala/scala-armada-client/project/build.properties renamed to client/scala/armada-scala-client/project/build.properties

File renamed without changes.

client/scala/scala-armada-client/project/plugins.sbt renamed to client/scala/armada-scala-client/project/plugins.sbt

File renamed without changes.

client/scala/scala-armada-client/src/main/scala/io/armadaproject/armada/ArmadaClient.scala renamed to client/scala/armada-scala-client/src/main/scala/io/armadaproject/armada/ArmadaClient.scala

File renamed without changes.

client/scala/scala-armada-client/src/test/scala/ArmadaClientSuite.scala renamed to client/scala/armada-scala-client/src/test/scala/ArmadaClientSuite.scala

File renamed without changes.

0 commit comments

Comments
 (0)