Skip to content

Commit

Permalink
Merge pull request #24 from kbase/staging
Browse files Browse the repository at this point in the history
Update master branch to 0.3.5
  • Loading branch information
msneddon committed Jun 24, 2015
2 parents 2277c2a + 1e14e56 commit c8c6b5f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
9 changes: 8 additions & 1 deletion RELEASE_NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,17 @@ TOs are limited to 1GB
TO subdata is limited to 15MB
TO provenance is limited to 1MB

VERSION: 0.3.5 (Released 5/15/15)
--------------------------------------
BUG FIXES:
- Updated auth library dependency that prevented validating user names
not in the KBase group, which was preventing sharing with a subset
of real and active KBase users.

VERSION: 0.3.4 (Released 4/10/15)
--------------------------------------
NEW FEATURES:
- added CLI command for listing properly configured Narratives
- Added CLI command for listing properly configured Narratives

UPDATED FEATURES / MAJOR BUG FIXES:
- Updated to the new auth client. Globus APIs changed in a way that broke
Expand Down
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

<fileset dir="${jardir}" id="clientserverlib">
<include name="junit/junit-4.9.jar"/>
<include name="kbase/auth/kbase-auth-0.3.0.jar"/>
<include name="kbase/auth/kbase-auth-0.3.1.jar"/>
<include name="jackson/jackson-annotations-2.2.3.jar"/>
<include name="jackson/jackson-core-2.2.3.jar"/>
<include name="jackson/jackson-databind-2.2.3.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion src/us/kbase/workspace/WorkspaceServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public class WorkspaceServer extends JsonServerServlet {
//TODO check shock version
//TODO shock client should ignore extra fields

private static final String VER = "0.3.4";
private static final String VER = "0.3.5";

//required deploy parameters:
private static final String HOST = "mongodb-host";
Expand Down
2 changes: 1 addition & 1 deletion src/us/kbase/workspace/test/kbase/JSONRPCLayerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public class JSONRPCLayerTest extends JSONRPCLayerTester {

@Test
public void ver() throws Exception {
assertThat("got correct version", CLIENT_NO_AUTH.ver(), is("0.3.4"));
assertThat("got correct version", CLIENT_NO_AUTH.ver(), is("0.3.5"));
}

@Test
Expand Down

0 comments on commit c8c6b5f

Please sign in to comment.