lp:~hegde-shashank/appscale/trunk

Branch merges

Propose for merging

1 branch proposed for merging into this one.

No branches dependent on this one.

Ready for review for merging into lp:~cgb-cs/appscale/main-cgb-research

Chris Bunch: Pending requested 2012-02-28

Diff: 2439 lines (+1665/-106) (has conflicts)

11 files modified

AppController/djinn.rb (+686/-25)
AppController/lib/djinn_job_data.rb (+25/-0)
AppController/lib/repo.rb (+238/-1)
AppController/lib/role_watcher.rb (+110/-0)
AppController/lib/zkinterface.rb (+195/-37)
AppServer/demos/therepo/repo.py (+8/-4)
Neptune/cewssa_helper.rb (+1/-1)
Neptune/dfsp_helper.rb (+1/-1)
Neptune/mpi_helper.rb (+11/-1)
Neptune/neptune.rb (+364/-36)
Neptune/neptune_job_data.rb (+26/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

801. By root <root@appscale-image0> on 2012-02-28

Deleting commented code

800. By root <root@appscale-image0> on 2012-02-28

refactored the code

799. By root <root@appscale-image0> on 2012-02-23

Neptune manager migration works!

798. By root <root@appscale-image0> on 2012-02-22

Saving neptune jobs and nodes to zookeeper

797. By root <root@appscale-image0> on 2012-02-15

Fixed neptune and saving the neptune data to zookeeper

796. By root <root@appscale-image0> on 2012-02-11

Storing nodes into zookeeper

795. By root <root@appscale-image0> on 2012-02-05

Added app manager failover

794. By root <root@appscale-image0> on 2012-01-28

Added leader election for status_monitor

793. By root <root@appscale-image0> on 2012-01-26

Added role watchers and callbacks

792. By root <root@appscale-image0> on 2012-01-25

Reconnecting to zookeeper if required