lp:~pbeaman/akiban-server/fix-direct-rest-bugs

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~akiban-technologies/akiban-server/trunk at revision 2635

Mike McMahon: Approve on 2013-04-23

Diff: 989 lines (+680/-46)

12 files modified

src/main/java/com/akiban/direct/DirectException.java (+0/-2)
src/main/java/com/akiban/rest/RestResponseBuilder.java (+3/-1)
src/main/java/com/akiban/rest/resources/DefaultResource.java (+1/-1)
src/main/java/com/akiban/server/service/restdml/DirectServiceImpl.java (+40/-32)
src/main/java/com/akiban/server/service/restdml/EndpointMetadata.java (+28/-6)
src/test/java/com/akiban/rest/RestServiceScriptsIT.java (+460/-0)
src/test/resources/com/akiban/rest/direct/bad-direct-create.body (+26/-0)
src/test/resources/com/akiban/rest/direct/direct-create.body (+4/-4)
src/test/resources/com/akiban/rest/direct/missing-direct-create.body (+9/-0)
src/test/resources/com/akiban/rest/direct/test-basic-direct-functions.script (+30/-0)
src/test/resources/com/akiban/rest/direct/test-direct-registration-errors.script (+33/-0)
src/test/resources/com/akiban/rest/direct/test-invalid-endpoint-errors.script (+46/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2638. By Peter Beaman on 2013-04-23

Merge from trunk, fix HttpStatus import and bad copyright notice

2637. By Peter Beaman on 2013-04-21

Add a LOG message when transaction retries more than 3 times

2636. By Peter Beaman on 2013-04-21

Fix Exception thrown on registration function error

2635. By Peter Beaman on 2013-04-20

Undo reformatting

2634. By Peter Beaman on 2013-04-20

Merge from trunk

2633. By Peter Beaman on 2013-04-19

Add debug logging

2632. By Peter Beaman on 2013-04-18

Correct several issues

2631. By Peter Beaman on 2013-04-18

Test some invalid endpoints

2630. By Peter Beaman on 2013-04-18

Some more tests

2629. By Peter Beaman on 2013-04-18

Support QUERY and EXPLAIN too