lp:~mmcm/akiban-server/pg-returning-json-with-meta-data

Branch merges

Propose for merging

No branches dependent on this one.

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

Thomas Jones-Low: Approve on 2013-04-23

Diff: 30 lines (+9/-0)

2 files modified

src/main/java/com/akiban/sql/pg/PostgresModifyOperatorStatement.java (+1/-0)
src/test/resources/com/akiban/sql/pg/yaml/functional/test-json-output-format.yaml (+8/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2638. By Mike McMahon on 2013-04-23

Output additional header stuff.

2637. By Mike McMahon on 2013-04-23

Add a test that shows the problem.

2636. By Akiban Build User on 2013-04-23

merge nwilliams: Remove empty http directory.

https://code.launchpad.net/~nwilliams/akiban-server/remove-empty-http-dir/+merge/160405

2635. By Akiban Build User on 2013-04-23

merge pbeaman: Fix several Akiban Direct issues itemized in bug1168547 and bug1168962.

https://code.launchpad.net/~pbeaman/akiban-server/fix-direct-rest-bugs/+merge/159960

2634. By Akiban Build User on 2013-04-22

merge nwilliams: Replace SingleThreadedJDBCService with new one backed directly by the SecurityService.

https://code.launchpad.net/~nwilliams/akiban-server/security-service-login-service/+merge/160229

2633. By Akiban Build User on 2013-04-21

merge mmcm: A couple more chartio meta-data queries.

https://code.launchpad.net/~mmcm/akiban-server/pg-chartio-queries-2/+merge/159961

2632. By Akiban Build User on 2013-04-19

merge mmcm: Add emulation for the simple queries that chartio sends when setting up a data source.

https://code.launchpad.net/~mmcm/akiban-server/pg-chartio-queries/+merge/159902

2631. By Akiban Build User on 2013-04-19

merge tjoneslo: Add the REST HttpConductor to the IS.server_servers table.

https://code.launchpad.net/~tjoneslo/akiban-server/add-rest-to-server-servers/+merge/159704

2630. By Akiban Build User on 2013-04-18

merge tjoneslo: Fix bug 1167451 - Have the SequenceDDL process check if the sequence in question is begin used as a identity column for a table and reject the drop with an error message.

https://code.launchpad.net/~tjoneslo/akiban-server/fix-bug-1167541/+merge/159496

2629. By Akiban Build User on 2013-04-18

merge tjoneslo: Fix bug 1169995 - Add a check to the select during PATCH such that if a PK field is null note you will never find any matching row, so force the insert processing.

https://code.launchpad.net/~tjoneslo/akiban-server/fix-bug-1169995/+merge/159517