Merge branch 'release/0.1.4'

azavea · Jan 28, 2016 · 0399618 · 0399618
2 parents 7e446a0 + 76209b9
commit 0399618
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ deploy:
   api_key:
     secure: V0yjW7wr+ke9pdVbwvgghBHgCM1/dobiOcmopdTT6aXG8oZew7GB60dx9GbUCYpCqM534/O2r0vDSm1D1z83ctAz6n9L1HZiHbOC9u1kjcYOzjdl1I/5qXteRSZ6a0PR8gvxSVjEwCbDqIKi9nggCcrUB8ZEfmo6GSBouuNUpVxfL4V+3oX/FswpexL73Z0HKNSyS44lOg2u8zhVlUpxZkMDpWw+tLbYw7n/dtGfkQ/bA2nADTXv2UZalwlhZXOGMf0up67INmseAaQcnLwNZqOacR9QrYmdoQUS97yug2lt7HHmzHHqhhboGnUy5YdxY0eUwWaflUXkH9E3an1UfOl61qbWYNEO0xxKG1dK78/DspcFYt6TfKtNKyYHbrw/VaZeiMYR8qPC8iyhEoQVaRxZ7zIL0A5Cj0hiRreppuWzU9xGGj4HgFxHEJfCQSeORVDS8c385MjbFjzvOvTPs7mdimvama79x4iWB+DruMygVBIUu/K0rJIMslmjkD5VJGBL9el8HyaQQN1w+tR0HCCEzNAtDV+tHOGoFuoQpFzfyZBFB2Iax5cFSkpC5BsdPESCHwrLsHCoBFoJTYS/QnXaq9F1HHzRM8FJBNzsw2dIprG8+mqFy7Amy3X1uq3XsEu1WFKmp0WLCfR9vw8FMRFAy3sg1hikiy2g0zUwFvw=
   file:
-    - server/target/scala-2.10/usaceflood-server-assembly-${TRAVIS_TAG}.jar
+    - server/target/scala-2.10/usaceflood-server-assembly-${TRAVIS_TAG}-SNAPSHOT.jar
   skip_cleanup: true
   on:
     repo: azavea/usace-flood-geoprocessing

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.4
+
+- Fix a problem in .travis.yml
+
 ## 0.1.3
 
 - Fix a problem in .travis.yml

diff --git a/project/Version.scala b/project/Version.scala
@@ -4,7 +4,7 @@ object Version {
   def either(environmentVariable: String, default: String): String =
     Properties.envOrElse(environmentVariable, default)
 
-  val version = "0.1.3"
+  val version = "0.1.4"
   val floodmodel = version + either("FLOODMODEL_VERSION_SUFFIX", "-SNAPSHOT")
 
   val scala = "2.10.6"