lp:~nwilliams/akiban-server/security-service-login-service

Branch merges

Propose for merging

No branches dependent on this one.

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

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

Diff: 540 lines (+256/-118)

9 files modified

src/main/java/com/akiban/http/HttpConductorImpl.java (+8/-47)
src/main/java/com/akiban/http/SecurityServiceLoginService.java (+72/-0)
src/main/java/com/akiban/server/service/security/SecurityServiceImpl.java (+6/-4)
src/main/java/com/akiban/server/service/security/User.java (+17/-1)
src/main/resources/com/akiban/http/basic.properties (+0/-33)
src/main/resources/com/akiban/http/digest.properties (+0/-33)
src/main/resources/com/akiban/server/service/config/configuration-defaults.properties (+3/-0)
src/test/java/com/akiban/http/HttpThreadedLoginIT.java (+147/-0)
src/test/java/com/akiban/server/service/security/SecurityServiceIT.java (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2638. By Nathan Williams on 2013-04-22

Remove unneeded import

2637. By Nathan Williams on 2013-04-22

Remove unneeded properties files

2636. By Nathan Williams on 2013-04-22

Login service that delegates to SecurityService

2635. By Nathan Williams on 2013-04-22

Expose password hashes, all roles from User object

2634. By Nathan Williams on 2013-04-22

Failing test

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