Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi into observer3.0
authorSapan Bhatia <gwsapan@gmail.com>
Wed, 16 Jul 2014 04:17:33 +0000 (00:17 -0400)
committerSapan Bhatia <gwsapan@gmail.com>
Wed, 16 Jul 2014 04:17:33 +0000 (00:17 -0400)
commitf0ecead28a78eec4e395c206120b99e4aebec1e7
tree810c36368861de1e426c2a6850bbdaed3ba20e7e
parentd3cfe42ee1adbe8163e17f08915e5c619ef198f0
parent958ef22033ef2584b742623d3d6a84376d68e06d
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi into observer3.0

Conflicts:
planetstack/core/fixtures/demo_data.json
planetstack/core/fixtures/initial_data.json
planetstack/core/models/plcorebase.py
planetstack/observer/event_loop.py
planetstack/observer/event_manager.py
planetstack/observer/steps/garbage_collector.py
planetstack/observer/syncstep.py
planetstack/core/models/plcorebase.py
planetstack/core/models/user.py
planetstack/observer/event_loop.py
planetstack/observer/event_manager.py
planetstack/observer/syncstep.py